From 23ffa00ca518ce39e886c02b3ea40e09eb4c3ac4 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 25 May 2016 01:31:49 -0700 Subject: [PATCH] Close #1028 add Fireproof versions of Vanilla wood items --- lang | 2 +- ...oodType.java => EnumForestryWoodType.java} | 18 +- .../arboriculture/EnumVanillaWoodType.java | 60 ++++ .../api/arboriculture/IAlleleTreeSpecies.java | 7 +- .../api/arboriculture/ITreeFactory.java | 6 +- .../api/arboriculture/IWoodAccess.java | 69 +---- .../forestry/api/arboriculture/IWoodType.java | 13 + .../api/arboriculture/WoodBlockKind.java | 12 + .../worldgen/VillageApiaristHouse.java | 50 ++-- .../forestry/arboriculture/IWoodTyped.java | 9 +- .../arboriculture/PluginArboriculture.java | 127 ++++---- .../arboriculture/VillagerArboristTrades.java | 11 +- .../forestry/arboriculture/WoodAccess.java | 276 +++++++++--------- .../forestry/arboriculture/WoodHelper.java | 56 ++-- .../arboriculture/blocks/BlockArbDoor.java | 20 +- ...eGate.java => BlockForestryFenceGate.java} | 56 ++-- ...rbStairs.java => BlockForestryStairs.java} | 49 ++-- .../blocks/BlockRegistryArboriculture.java | 93 +++++- .../blocks/WoodTypePredicate.java | 6 +- .../blocks/WoodTypeStateMapper.java | 45 ++- .../blocks/fence/BlockArbFence.java | 52 ++++ .../fence/BlockFireproofVanillaFence.java | 39 +++ .../BlockForestryFence.java} | 71 ++--- .../arboriculture/blocks/log/BlockArbLog.java | 48 +++ .../blocks/log/BlockFireproofVanillaLog.java | 48 +++ .../BlockForestryLog.java} | 147 ++++------ .../blocks/planks/BlockArbPlanks.java | 48 +++ .../planks/BlockFireproofVanillaPlanks.java | 38 +++ .../BlockForestryPlanks.java} | 87 ++---- .../property/PropertyForestryWoodType.java | 27 ++ .../blocks/property/PropertyTree.java | 4 +- .../property/PropertyVanillaWoodType.java | 38 +++ .../blocks/property/PropertyWoodType.java | 24 +- .../blocks/slab/BlockArbSlab.java | 56 ++++ .../slab/BlockFireproofVanillaSlab.java | 56 ++++ .../BlockForestrySlab.java} | 93 ++---- .../genetics/TreeDefinition.java | 129 ++++---- .../arboriculture/genetics/TreeFactory.java | 5 +- .../arboriculture/genetics/WoodProvider.java | 37 ++- .../genetics/WoodProviderFactory.java | 18 ++ .../genetics/WoodProviderVanilla.java | 86 +++--- .../genetics/alleles/AlleleTreeSpecies.java | 10 - .../arboriculture/items/ItemBlockWood.java | 4 +- .../items/ItemBlockWoodSlab.java | 10 +- .../models/ModelProviderFactory.java | 20 ++ .../models/ModelProviderGermling.java | 4 +- .../models/ModelProviderGermlingVanilla.java | 22 +- .../{doors/ebony.json => door/acacia.json} | 64 ++-- .../{doors/cherry.json => door/balsa.json} | 64 ++-- .../{doors/balsa.json => door/baobab.json} | 64 ++-- .../{doors/maple.json => door/cherry.json} | 64 ++-- .../{doors/baobab.json => door/chestnut.json} | 64 ++-- .../{doors/kapok.json => door/citrus.json} | 64 ++-- .../arboriculture/door/cocobolo.json | 36 +++ .../blockstates/arboriculture/door/ebony.json | 36 +++ .../arboriculture/door/giganteum.json | 36 +++ .../giganteum.json => door/greenheart.json} | 64 ++-- .../arboriculture/{doors => door}/ipe.json | 64 ++-- .../{doors/pine.json => door/kapok.json} | 64 ++-- .../blockstates/arboriculture/door/larch.json | 36 +++ .../arboriculture/{doors => door}/lime.json | 64 ++-- .../blockstates/arboriculture/door/mahoe.json | 36 +++ .../arboriculture/door/mahogany.json | 36 +++ .../blockstates/arboriculture/door/maple.json | 36 +++ .../arboriculture/door/padauk.json | 36 +++ .../arboriculture/{doors => door}/palm.json | 64 ++-- .../{doors/larch.json => door/papaya.json} | 64 ++-- .../blockstates/arboriculture/door/pine.json | 36 +++ .../arboriculture/{doors => door}/plum.json | 64 ++-- .../arboriculture/door/poplar.json | 36 +++ .../{doors/acacia.json => door/sequoia.json} | 64 ++-- .../arboriculture/{doors => door}/teak.json | 64 ++-- .../arboriculture/door/walnut.json | 36 +++ .../blockstates/arboriculture/door/wenge.json | 36 +++ .../arboriculture/door/willow.json | 36 +++ .../arboriculture/door/zebrawood.json | 36 +++ .../arboriculture/doors/chestnut.json | 36 --- .../arboriculture/doors/citrus.json | 36 --- .../arboriculture/doors/cocobolo.json | 36 --- .../arboriculture/doors/greenheart.json | 36 --- .../arboriculture/doors/mahoe.json | 36 --- .../arboriculture/doors/mahogany.json | 36 --- .../arboriculture/doors/padauk.json | 36 --- .../arboriculture/doors/papaya.json | 36 --- .../arboriculture/doors/poplar.json | 36 --- .../arboriculture/doors/sequoia.json | 36 --- .../arboriculture/doors/walnut.json | 36 --- .../arboriculture/doors/wenge.json | 36 --- .../arboriculture/doors/willow.json | 36 --- .../arboriculture/doors/zebrawood.json | 36 --- .../{slab/double => double_slab}/acacia.json | 0 .../{slab/double => double_slab}/balsa.json | 0 .../{slab/double => double_slab}/baobab.json | 0 .../{slab/double => double_slab}/cherry.json | 0 .../double => double_slab}/chestnut.json | 0 .../{slab/double => double_slab}/citrus.json | 0 .../double => double_slab}/cocobolo.json | 0 .../{slab/double => double_slab}/ebony.json | 0 .../double => double_slab}/giganteum.json | 0 .../double => double_slab}/greenheart.json | 0 .../{slab/double => double_slab}/ipe.json | 0 .../{slab/double => double_slab}/kapok.json | 0 .../{slab/double => double_slab}/larch.json | 0 .../{slab/double => double_slab}/lime.json | 0 .../{slab/double => double_slab}/mahoe.json | 0 .../double => double_slab}/mahogany.json | 0 .../{slab/double => double_slab}/maple.json | 0 .../{slab/double => double_slab}/padauk.json | 0 .../{slab/double => double_slab}/palm.json | 0 .../{slab/double => double_slab}/papaya.json | 0 .../{slab/double => double_slab}/pine.json | 0 .../{slab/double => double_slab}/plum.json | 0 .../{slab/double => double_slab}/poplar.json | 0 .../{slab/double => double_slab}/sequoia.json | 0 .../{slab/double => double_slab}/teak.json | 0 .../{slab/double => double_slab}/walnut.json | 0 .../{slab/double => double_slab}/wenge.json | 0 .../{slab/double => double_slab}/willow.json | 0 .../double => double_slab}/zebrawood.json | 0 .../arboriculture/fence/acacia.json | 17 ++ .../arboriculture/fence/balsa.json | 17 ++ .../arboriculture/fence/baobab.json | 17 ++ .../arboriculture/fence/cherry.json | 17 ++ .../arboriculture/fence/chestnut.json | 17 ++ .../arboriculture/fence/citrus.json | 17 ++ .../arboriculture/fence/cocobolo.json | 17 ++ .../arboriculture/fence/ebony.json | 17 ++ .../arboriculture/fence/giganteum.json | 17 ++ .../arboriculture/fence/greenheart.json | 17 ++ .../blockstates/arboriculture/fence/ipe.json | 17 ++ .../arboriculture/fence/kapok.json | 17 ++ .../arboriculture/fence/larch.json | 17 ++ .../blockstates/arboriculture/fence/lime.json | 17 ++ .../arboriculture/fence/mahoe.json | 17 ++ .../arboriculture/fence/mahogany.json | 17 ++ .../arboriculture/fence/maple.json | 17 ++ .../arboriculture/fence/padauk.json | 17 ++ .../blockstates/arboriculture/fence/palm.json | 17 ++ .../arboriculture/fence/papaya.json | 17 ++ .../blockstates/arboriculture/fence/pine.json | 17 ++ .../blockstates/arboriculture/fence/plum.json | 17 ++ .../arboriculture/fence/poplar.json | 17 ++ .../arboriculture/fence/sequoia.json | 17 ++ .../blockstates/arboriculture/fence/teak.json | 17 ++ .../arboriculture/fence/walnut.json | 17 ++ .../arboriculture/fence/wenge.json | 17 ++ .../arboriculture/fence/willow.json | 17 ++ .../arboriculture/fence/zebrawood.json | 17 ++ .../larch.json => fence_gate/acacia.json} | 32 +- .../lime.json => fence_gate/balsa.json} | 32 +- .../ebony.json => fence_gate/baobab.json} | 32 +- .../balsa.json => fence_gate/cherry.json} | 32 +- .../sequoia.json => fence_gate/chestnut.json} | 32 +- .../kapok.json => fence_gate/citrus.json} | 32 +- .../citrus.json => fence_gate/cocobolo.json} | 32 +- .../pine.json => fence_gate/ebony.json} | 32 +- .../giganteum.json} | 32 +- .../greenheart.json} | 32 +- .../arboriculture/fence_gate/ipe.json | 20 ++ .../palm.json => fence_gate/kapok.json} | 32 +- .../plum.json => fence_gate/larch.json} | 32 +- .../ipe.json => fence_gate/lime.json} | 32 +- .../arboriculture/fence_gate/mahoe.json | 20 ++ .../cherry.json => fence_gate/mahogany.json} | 32 +- .../arboriculture/fence_gate/maple.json | 20 ++ .../arboriculture/fence_gate/padauk.json | 20 ++ .../arboriculture/fence_gate/palm.json | 20 ++ .../arboriculture/fence_gate/papaya.json | 20 ++ .../arboriculture/fence_gate/pine.json | 20 ++ .../arboriculture/fence_gate/plum.json | 20 ++ .../arboriculture/fence_gate/poplar.json | 20 ++ .../acacia.json => fence_gate/sequoia.json} | 32 +- .../{fence_gates => fence_gate}/teak.json | 32 +- .../arboriculture/fence_gate/walnut.json | 20 ++ .../arboriculture/fence_gate/wenge.json | 20 ++ .../arboriculture/fence_gate/willow.json | 20 ++ .../zebrawood.json} | 32 +- .../arboriculture/fence_gates/baobab.json | 20 -- .../arboriculture/fence_gates/giganteum.json | 20 -- .../arboriculture/fence_gates/greenheart.json | 20 -- .../arboriculture/fence_gates/mahoe.json | 20 -- .../arboriculture/fence_gates/mahogany.json | 20 -- .../arboriculture/fence_gates/maple.json | 20 -- .../arboriculture/fence_gates/padauk.json | 20 -- .../arboriculture/fence_gates/papaya.json | 20 -- .../arboriculture/fence_gates/poplar.json | 20 -- .../arboriculture/fence_gates/walnut.json | 20 -- .../arboriculture/fence_gates/wenge.json | 20 -- .../arboriculture/fence_gates/willow.json | 20 -- .../arboriculture/fences/acacia.json | 17 -- .../arboriculture/fences/balsa.json | 17 -- .../arboriculture/fences/baobab.json | 17 -- .../arboriculture/fences/cherry.json | 17 -- .../arboriculture/fences/chestnut.json | 17 -- .../arboriculture/fences/citrus.json | 17 -- .../arboriculture/fences/cocobolo.json | 17 -- .../arboriculture/fences/ebony.json | 17 -- .../arboriculture/fences/giganteum.json | 17 -- .../arboriculture/fences/greenheart.json | 17 -- .../blockstates/arboriculture/fences/ipe.json | 17 -- .../arboriculture/fences/kapok.json | 17 -- .../arboriculture/fences/larch.json | 17 -- .../arboriculture/fences/lime.json | 17 -- .../arboriculture/fences/mahoe.json | 17 -- .../arboriculture/fences/mahogany.json | 17 -- .../arboriculture/fences/maple.json | 17 -- .../arboriculture/fences/padauk.json | 17 -- .../arboriculture/fences/palm.json | 17 -- .../arboriculture/fences/papaya.json | 17 -- .../arboriculture/fences/pine.json | 17 -- .../arboriculture/fences/plum.json | 17 -- .../arboriculture/fences/poplar.json | 17 -- .../arboriculture/fences/sequoia.json | 17 -- .../arboriculture/fences/teak.json | 17 -- .../arboriculture/fences/walnut.json | 17 -- .../arboriculture/fences/wenge.json | 17 -- .../arboriculture/fences/willow.json | 17 -- .../arboriculture/fences/zebrawood.json | 17 -- .../blockstates/arboriculture/log/acacia.json | 8 +- .../blockstates/arboriculture/log/balsa.json | 8 +- .../blockstates/arboriculture/log/baobab.json | 8 +- .../blockstates/arboriculture/log/cherry.json | 8 +- .../arboriculture/log/chestnut.json | 8 +- .../blockstates/arboriculture/log/citrus.json | 8 +- .../arboriculture/log/cocobolo.json | 8 +- .../blockstates/arboriculture/log/ebony.json | 8 +- .../arboriculture/log/giganteum.json | 8 +- .../arboriculture/log/greenheart.json | 8 +- .../blockstates/arboriculture/log/ipe.json | 8 +- .../blockstates/arboriculture/log/kapok.json | 8 +- .../blockstates/arboriculture/log/larch.json | 8 +- .../blockstates/arboriculture/log/lime.json | 8 +- .../blockstates/arboriculture/log/mahoe.json | 8 +- .../arboriculture/log/mahogany.json | 8 +- .../blockstates/arboriculture/log/maple.json | 8 +- .../blockstates/arboriculture/log/padauk.json | 8 +- .../blockstates/arboriculture/log/palm.json | 8 +- .../blockstates/arboriculture/log/papaya.json | 8 +- .../blockstates/arboriculture/log/pine.json | 8 +- .../blockstates/arboriculture/log/plum.json | 8 +- .../blockstates/arboriculture/log/poplar.json | 8 +- .../arboriculture/log/sequoia.json | 8 +- .../blockstates/arboriculture/log/teak.json | 8 +- .../blockstates/arboriculture/log/walnut.json | 8 +- .../blockstates/arboriculture/log/wenge.json | 8 +- .../blockstates/arboriculture/log/willow.json | 8 +- .../arboriculture/log/zebrawood.json | 8 +- .../{doors => door}/acacia_bottom.json | 0 .../{doors => door}/acacia_bottom_rh.json | 0 .../{doors => door}/acacia_top.json | 0 .../{doors => door}/acacia_top_rh.json | 0 .../{doors => door}/balsa_bottom.json | 0 .../{doors => door}/balsa_bottom_rh.json | 0 .../{doors => door}/balsa_top.json | 0 .../{doors => door}/balsa_top_rh.json | 0 .../{doors => door}/baobab_bottom.json | 0 .../{doors => door}/baobab_bottom_rh.json | 0 .../{doors => door}/baobab_top.json | 0 .../{doors => door}/baobab_top_rh.json | 0 .../{doors => door}/cherry_bottom.json | 0 .../{doors => door}/cherry_bottom_rh.json | 0 .../{doors => door}/cherry_top.json | 0 .../{doors => door}/cherry_top_rh.json | 0 .../{doors => door}/chestnut_bottom.json | 0 .../{doors => door}/chestnut_bottom_rh.json | 0 .../{doors => door}/chestnut_top.json | 0 .../{doors => door}/chestnut_top_rh.json | 0 .../{doors => door}/citrus_bottom.json | 0 .../{doors => door}/citrus_bottom_rh.json | 0 .../{doors => door}/citrus_top.json | 0 .../{doors => door}/citrus_top_rh.json | 0 .../{doors => door}/cocobolo_bottom.json | 0 .../{doors => door}/cocobolo_bottom_rh.json | 0 .../{doors => door}/cocobolo_top.json | 0 .../{doors => door}/cocobolo_top_rh.json | 0 .../{doors => door}/ebony_bottom.json | 0 .../{doors => door}/ebony_bottom_rh.json | 0 .../{doors => door}/ebony_top.json | 0 .../{doors => door}/ebony_top_rh.json | 0 .../{doors => door}/giganteum_bottom.json | 0 .../{doors => door}/giganteum_bottom_rh.json | 0 .../{doors => door}/giganteum_top.json | 0 .../{doors => door}/giganteum_top_rh.json | 0 .../{doors => door}/greenheart_bottom.json | 0 .../{doors => door}/greenheart_bottom_rh.json | 0 .../{doors => door}/greenheart_top.json | 0 .../{doors => door}/greenheart_top_rh.json | 0 .../{doors => door}/ipe_bottom.json | 0 .../{doors => door}/ipe_bottom_rh.json | 0 .../{doors => door}/ipe_top.json | 0 .../{doors => door}/ipe_top_rh.json | 0 .../{doors => door}/kapok_bottom.json | 0 .../{doors => door}/kapok_bottom_rh.json | 0 .../{doors => door}/kapok_top.json | 0 .../{doors => door}/kapok_top_rh.json | 0 .../{doors => door}/larch_bottom.json | 0 .../{doors => door}/larch_bottom_rh.json | 0 .../{doors => door}/larch_top.json | 0 .../{doors => door}/larch_top_rh.json | 0 .../{doors => door}/lime_bottom.json | 0 .../{doors => door}/lime_bottom_rh.json | 0 .../{doors => door}/lime_top.json | 0 .../{doors => door}/lime_top_rh.json | 0 .../{doors => door}/mahoe_bottom.json | 0 .../{doors => door}/mahoe_bottom_rh.json | 0 .../{doors => door}/mahoe_top.json | 0 .../{doors => door}/mahoe_top_rh.json | 0 .../{doors => door}/mahogany_bottom.json | 0 .../{doors => door}/mahogany_bottom_rh.json | 0 .../{doors => door}/mahogany_top.json | 0 .../{doors => door}/mahogany_top_rh.json | 0 .../{doors => door}/maple_bottom.json | 0 .../{doors => door}/maple_bottom_rh.json | 0 .../{doors => door}/maple_top.json | 0 .../{doors => door}/maple_top_rh.json | 0 .../{doors => door}/padauk_bottom.json | 0 .../{doors => door}/padauk_bottom_rh.json | 0 .../{doors => door}/padauk_top.json | 0 .../{doors => door}/padauk_top_rh.json | 0 .../{doors => door}/palm_bottom.json | 0 .../{doors => door}/palm_bottom_rh.json | 0 .../{doors => door}/palm_top.json | 0 .../{doors => door}/palm_top_rh.json | 0 .../{doors => door}/papaya_bottom.json | 0 .../{doors => door}/papaya_bottom_rh.json | 0 .../{doors => door}/papaya_top.json | 0 .../{doors => door}/papaya_top_rh.json | 0 .../{doors => door}/pine_bottom.json | 0 .../{doors => door}/pine_bottom_rh.json | 0 .../{doors => door}/pine_top.json | 0 .../{doors => door}/pine_top_rh.json | 0 .../{doors => door}/plum_bottom.json | 0 .../{doors => door}/plum_bottom_rh.json | 0 .../{doors => door}/plum_top.json | 0 .../{doors => door}/plum_top_rh.json | 0 .../{doors => door}/poplar_bottom.json | 0 .../{doors => door}/poplar_bottom_rh.json | 0 .../{doors => door}/poplar_top.json | 0 .../{doors => door}/poplar_top_rh.json | 0 .../{doors => door}/sequoia_bottom.json | 0 .../{doors => door}/sequoia_bottom_rh.json | 0 .../{doors => door}/sequoia_top.json | 0 .../{doors => door}/sequoia_top_rh.json | 0 .../{doors => door}/teak_bottom.json | 0 .../{doors => door}/teak_bottom_rh.json | 0 .../{doors => door}/teak_top.json | 0 .../{doors => door}/teak_top_rh.json | 0 .../{doors => door}/walnut_bottom.json | 0 .../{doors => door}/walnut_bottom_rh.json | 0 .../{doors => door}/walnut_top.json | 0 .../{doors => door}/walnut_top_rh.json | 0 .../{doors => door}/wenge_bottom.json | 0 .../{doors => door}/wenge_bottom_rh.json | 0 .../{doors => door}/wenge_top.json | 0 .../{doors => door}/wenge_top_rh.json | 0 .../{doors => door}/willow_bottom.json | 0 .../{doors => door}/willow_bottom_rh.json | 0 .../{doors => door}/willow_top.json | 0 .../{doors => door}/willow_top_rh.json | 0 .../{doors => door}/zebrawood_bottom.json | 0 .../{doors => door}/zebrawood_bottom_rh.json | 0 .../{doors => door}/zebrawood_top.json | 0 .../{doors => door}/zebrawood_top_rh.json | 0 .../{fences => fence}/acacia_inventory.json | 0 .../{fences => fence}/acacia_post.json | 0 .../{fences => fence}/acacia_side.json | 0 .../{fences => fence}/balsa_inventory.json | 0 .../{fences => fence}/balsa_post.json | 0 .../{fences => fence}/balsa_side.json | 0 .../{fences => fence}/baobab_inventory.json | 0 .../{fences => fence}/baobab_post.json | 0 .../{fences => fence}/baobab_side.json | 0 .../{fences => fence}/cherry_inventory.json | 0 .../{fences => fence}/cherry_post.json | 0 .../{fences => fence}/cherry_side.json | 0 .../{fences => fence}/chestnut_inventory.json | 0 .../{fences => fence}/chestnut_post.json | 0 .../{fences => fence}/chestnut_side.json | 0 .../{fences => fence}/citrus_inventory.json | 0 .../{fences => fence}/citrus_post.json | 0 .../{fences => fence}/citrus_side.json | 0 .../{fences => fence}/cocobolo_inventory.json | 0 .../{fences => fence}/cocobolo_post.json | 0 .../{fences => fence}/cocobolo_side.json | 0 .../{fences => fence}/ebony_inventory.json | 0 .../{fences => fence}/ebony_post.json | 0 .../{fences => fence}/ebony_side.json | 0 .../giganteum_inventory.json | 0 .../{fences => fence}/giganteum_post.json | 0 .../{fences => fence}/giganteum_side.json | 0 .../greenheart_inventory.json | 0 .../{fences => fence}/greenheart_post.json | 0 .../{fences => fence}/greenheart_side.json | 0 .../{fences => fence}/ipe_inventory.json | 0 .../{fences => fence}/ipe_post.json | 0 .../{fences => fence}/ipe_side.json | 0 .../{fences => fence}/kapok_inventory.json | 0 .../{fences => fence}/kapok_post.json | 0 .../{fences => fence}/kapok_side.json | 0 .../{fences => fence}/larch_inventory.json | 0 .../{fences => fence}/larch_post.json | 0 .../{fences => fence}/larch_side.json | 0 .../{fences => fence}/lime_inventory.json | 0 .../{fences => fence}/lime_post.json | 0 .../{fences => fence}/lime_side.json | 0 .../{fences => fence}/mahoe_inventory.json | 0 .../{fences => fence}/mahoe_post.json | 0 .../{fences => fence}/mahoe_side.json | 0 .../{fences => fence}/mahogany_inventory.json | 0 .../{fences => fence}/mahogany_post.json | 0 .../{fences => fence}/mahogany_side.json | 0 .../{fences => fence}/maple_inventory.json | 0 .../{fences => fence}/maple_post.json | 0 .../{fences => fence}/maple_side.json | 0 .../{fences => fence}/padauk_inventory.json | 0 .../{fences => fence}/padauk_post.json | 0 .../{fences => fence}/padauk_side.json | 0 .../{fences => fence}/palm_inventory.json | 0 .../{fences => fence}/palm_post.json | 0 .../{fences => fence}/palm_side.json | 0 .../{fences => fence}/papaya_inventory.json | 0 .../{fences => fence}/papaya_post.json | 0 .../{fences => fence}/papaya_side.json | 0 .../{fences => fence}/pine_inventory.json | 0 .../{fences => fence}/pine_post.json | 0 .../{fences => fence}/pine_side.json | 0 .../{fences => fence}/plum_inventory.json | 0 .../{fences => fence}/plum_post.json | 0 .../{fences => fence}/plum_side.json | 0 .../{fences => fence}/poplar_inventory.json | 0 .../{fences => fence}/poplar_post.json | 0 .../{fences => fence}/poplar_side.json | 0 .../{fences => fence}/sequoia_inventory.json | 0 .../{fences => fence}/sequoia_post.json | 0 .../{fences => fence}/sequoia_side.json | 0 .../{fences => fence}/teak_inventory.json | 0 .../{fences => fence}/teak_post.json | 0 .../{fences => fence}/teak_side.json | 0 .../{fences => fence}/walnut_inventory.json | 0 .../{fences => fence}/walnut_post.json | 0 .../{fences => fence}/walnut_side.json | 0 .../{fences => fence}/wenge_inventory.json | 0 .../{fences => fence}/wenge_post.json | 0 .../{fences => fence}/wenge_side.json | 0 .../{fences => fence}/willow_inventory.json | 0 .../{fences => fence}/willow_post.json | 0 .../{fences => fence}/willow_side.json | 0 .../zebrawood_inventory.json | 0 .../{fences => fence}/zebrawood_post.json | 0 .../{fences => fence}/zebrawood_side.json | 0 .../acacia_closed.json | 0 .../acacia_open.json | 0 .../acacia_wall_closed.json | 0 .../acacia_wall_open.json | 0 .../balsa_closed.json | 0 .../balsa_open.json | 0 .../balsa_wall_closed.json | 0 .../balsa_wall_open.json | 0 .../baobab_closed.json | 0 .../baobab_open.json | 0 .../baobab_wall_closed.json | 0 .../baobab_wall_open.json | 0 .../cherry_closed.json | 0 .../cherry_open.json | 0 .../cherry_wall_closed.json | 0 .../cherry_wall_open.json | 0 .../chestnut_closed.json | 0 .../chestnut_open.json | 0 .../chestnut_wall_closed.json | 0 .../chestnut_wall_open.json | 0 .../citrus_closed.json | 0 .../citrus_open.json | 0 .../citrus_wall_closed.json | 0 .../citrus_wall_open.json | 0 .../cocobolo_closed.json | 0 .../cocobolo_open.json | 0 .../cocobolo_wall_closed.json | 0 .../cocobolo_wall_open.json | 0 .../ebony_closed.json | 0 .../ebony_open.json | 0 .../ebony_wall_closed.json | 0 .../ebony_wall_open.json | 0 .../giganteum_closed.json | 0 .../giganteum_open.json | 0 .../giganteum_wall_closed.json | 0 .../giganteum_wall_open.json | 0 .../greenheart_closed.json | 0 .../greenheart_open.json | 0 .../greenheart_wall_closed.json | 0 .../greenheart_wall_open.json | 0 .../ipe_closed.json | 0 .../{fence_gates => fence_gate}/ipe_open.json | 0 .../ipe_wall_closed.json | 0 .../ipe_wall_open.json | 0 .../kapok_closed.json | 0 .../kapok_open.json | 0 .../kapok_wall_closed.json | 0 .../kapok_wall_open.json | 0 .../larch_closed.json | 0 .../larch_open.json | 0 .../larch_wall_closed.json | 0 .../larch_wall_open.json | 0 .../lime_closed.json | 0 .../lime_open.json | 0 .../lime_wall_closed.json | 0 .../lime_wall_open.json | 0 .../mahoe_closed.json | 0 .../mahoe_open.json | 0 .../mahoe_wall_closed.json | 0 .../mahoe_wall_open.json | 0 .../mahogany_closed.json | 0 .../mahogany_open.json | 0 .../mahogany_wall_closed.json | 0 .../mahogany_wall_open.json | 0 .../maple_closed.json | 0 .../maple_open.json | 0 .../maple_wall_closed.json | 0 .../maple_wall_open.json | 0 .../padauk_closed.json | 0 .../padauk_open.json | 0 .../padauk_wall_closed.json | 0 .../padauk_wall_open.json | 0 .../palm_closed.json | 0 .../palm_open.json | 0 .../palm_wall_closed.json | 0 .../palm_wall_open.json | 0 .../papaya_closed.json | 0 .../papaya_open.json | 0 .../papaya_wall_closed.json | 0 .../papaya_wall_open.json | 0 .../pine_closed.json | 0 .../pine_open.json | 0 .../pine_wall_closed.json | 0 .../pine_wall_open.json | 0 .../plum_closed.json | 0 .../plum_open.json | 0 .../plum_wall_closed.json | 0 .../plum_wall_open.json | 0 .../poplar_closed.json | 0 .../poplar_open.json | 0 .../poplar_wall_closed.json | 0 .../poplar_wall_open.json | 0 .../sequoia_closed.json | 0 .../sequoia_open.json | 0 .../sequoia_wall_closed.json | 0 .../sequoia_wall_open.json | 0 .../teak_closed.json | 0 .../teak_open.json | 0 .../teak_wall_closed.json | 0 .../teak_wall_open.json | 0 .../walnut_closed.json | 0 .../walnut_open.json | 0 .../walnut_wall_closed.json | 0 .../walnut_wall_open.json | 0 .../wenge_closed.json | 0 .../wenge_open.json | 0 .../wenge_wall_closed.json | 0 .../wenge_wall_open.json | 0 .../willow_closed.json | 0 .../willow_open.json | 0 .../willow_wall_closed.json | 0 .../willow_wall_open.json | 0 .../zebrawood_closed.json | 0 .../zebrawood_open.json | 0 .../zebrawood_wall_closed.json | 0 .../zebrawood_wall_open.json | 0 .../arboriculture/{logs => log}/acacia.json | 0 .../{logs => log}/acacia_bark.json | 0 .../{logs => log}/acacia_side.json | 0 .../arboriculture/{logs => log}/balsa.json | 0 .../{logs => log}/balsa_bark.json | 0 .../{logs => log}/balsa_side.json | 0 .../arboriculture/{logs => log}/baobab.json | 0 .../{logs => log}/baobab_bark.json | 0 .../{logs => log}/baobab_side.json | 0 .../arboriculture/{logs => log}/cherry.json | 0 .../{logs => log}/cherry_bark.json | 0 .../{logs => log}/cherry_side.json | 0 .../arboriculture/{logs => log}/chestnut.json | 0 .../{logs => log}/chestnut_bark.json | 0 .../{logs => log}/chestnut_side.json | 0 .../arboriculture/{logs => log}/citrus.json | 0 .../{logs => log}/citrus_bark.json | 0 .../{logs => log}/citrus_side.json | 0 .../arboriculture/{logs => log}/cocobolo.json | 0 .../{logs => log}/cocobolo_bark.json | 0 .../{logs => log}/cocobolo_side.json | 0 .../arboriculture/{logs => log}/ebony.json | 0 .../{logs => log}/ebony_bark.json | 0 .../{logs => log}/ebony_side.json | 0 .../{logs => log}/giganteum.json | 0 .../{logs => log}/giganteum_bark.json | 0 .../{logs => log}/giganteum_side.json | 0 .../{logs => log}/greenheart.json | 0 .../{logs => log}/greenheart_bark.json | 0 .../{logs => log}/greenheart_side.json | 0 .../arboriculture/{logs => log}/ipe.json | 0 .../arboriculture/{logs => log}/ipe_bark.json | 0 .../arboriculture/{logs => log}/ipe_side.json | 0 .../arboriculture/{logs => log}/kapok.json | 0 .../{logs => log}/kapok_bark.json | 0 .../{logs => log}/kapok_side.json | 0 .../arboriculture/{logs => log}/larch.json | 0 .../{logs => log}/larch_bark.json | 0 .../{logs => log}/larch_side.json | 0 .../arboriculture/{logs => log}/lime.json | 0 .../{logs => log}/lime_bark.json | 0 .../{logs => log}/lime_side.json | 0 .../arboriculture/{logs => log}/mahoe.json | 0 .../{logs => log}/mahoe_bark.json | 0 .../{logs => log}/mahoe_side.json | 0 .../arboriculture/{logs => log}/mahogany.json | 0 .../{logs => log}/mahogany_bark.json | 0 .../{logs => log}/mahogany_side.json | 0 .../arboriculture/{logs => log}/maple.json | 0 .../{logs => log}/maple_bark.json | 0 .../{logs => log}/maple_side.json | 0 .../arboriculture/{logs => log}/padauk.json | 0 .../{logs => log}/padauk_bark.json | 0 .../{logs => log}/padauk_side.json | 0 .../arboriculture/{logs => log}/palm.json | 0 .../{logs => log}/palm_bark.json | 0 .../{logs => log}/palm_side.json | 0 .../arboriculture/{logs => log}/papaya.json | 0 .../{logs => log}/papaya_bark.json | 0 .../{logs => log}/papaya_side.json | 0 .../arboriculture/{logs => log}/pine.json | 0 .../{logs => log}/pine_bark.json | 0 .../{logs => log}/pine_side.json | 0 .../arboriculture/{logs => log}/plum.json | 0 .../{logs => log}/plum_bark.json | 0 .../{logs => log}/plum_side.json | 0 .../arboriculture/{logs => log}/poplar.json | 0 .../{logs => log}/poplar_bark.json | 0 .../{logs => log}/poplar_side.json | 0 .../arboriculture/{logs => log}/sequoia.json | 0 .../{logs => log}/sequoia_bark.json | 0 .../{logs => log}/sequoia_side.json | 0 .../arboriculture/{logs => log}/teak.json | 0 .../{logs => log}/teak_bark.json | 0 .../{logs => log}/teak_side.json | 0 .../arboriculture/{logs => log}/walnut.json | 0 .../{logs => log}/walnut_bark.json | 0 .../{logs => log}/walnut_side.json | 0 .../arboriculture/{logs => log}/wenge.json | 0 .../{logs => log}/wenge_bark.json | 0 .../{logs => log}/wenge_side.json | 0 .../arboriculture/{logs => log}/willow.json | 0 .../{logs => log}/willow_bark.json | 0 .../{logs => log}/willow_side.json | 0 .../{logs => log}/zebrawood.json | 0 .../{logs => log}/zebrawood_bark.json | 0 .../{logs => log}/zebrawood_side.json | 0 .../models/item/{doors => door}/acacia.json | 0 .../models/item/{doors => door}/balsa.json | 0 .../models/item/{doors => door}/baobab.json | 0 .../models/item/{doors => door}/cherry.json | 0 .../models/item/{doors => door}/chestnut.json | 0 .../models/item/{doors => door}/citrus.json | 0 .../models/item/{doors => door}/cocobolo.json | 0 .../models/item/{doors => door}/ebony.json | 0 .../item/{doors => door}/giganteum.json | 0 .../item/{doors => door}/greenheart.json | 0 .../models/item/{doors => door}/ipe.json | 0 .../models/item/{doors => door}/kapok.json | 0 .../models/item/{doors => door}/larch.json | 0 .../models/item/{doors => door}/lime.json | 0 .../models/item/{doors => door}/mahoe.json | 0 .../models/item/{doors => door}/mahogany.json | 0 .../models/item/{doors => door}/maple.json | 0 .../models/item/{doors => door}/padauk.json | 0 .../models/item/{doors => door}/palm.json | 0 .../models/item/{doors => door}/papaya.json | 0 .../models/item/{doors => door}/pine.json | 0 .../models/item/{doors => door}/plum.json | 0 .../models/item/{doors => door}/poplar.json | 0 .../models/item/{doors => door}/sequoia.json | 0 .../models/item/{doors => door}/teak.json | 0 .../models/item/{doors => door}/walnut.json | 0 .../models/item/{doors => door}/wenge.json | 0 .../models/item/{doors => door}/willow.json | 0 .../item/{doors => door}/zebrawood.json | 0 .../forestry/models/item/fence/acacia.json | 3 + .../forestry/models/item/fence/balsa.json | 3 + .../forestry/models/item/fence/baobab.json | 3 + .../forestry/models/item/fence/cherry.json | 3 + .../forestry/models/item/fence/chestnut.json | 3 + .../forestry/models/item/fence/citrus.json | 3 + .../forestry/models/item/fence/cocobolo.json | 3 + .../forestry/models/item/fence/ebony.json | 3 + .../forestry/models/item/fence/giganteum.json | 3 + .../models/item/fence/greenheart.json | 3 + .../forestry/models/item/fence/ipe.json | 3 + .../forestry/models/item/fence/kapok.json | 3 + .../forestry/models/item/fence/larch.json | 3 + .../forestry/models/item/fence/lime.json | 3 + .../forestry/models/item/fence/mahoe.json | 3 + .../forestry/models/item/fence/mahogany.json | 3 + .../forestry/models/item/fence/maple.json | 3 + .../forestry/models/item/fence/padauk.json | 3 + .../forestry/models/item/fence/palm.json | 3 + .../forestry/models/item/fence/papaya.json | 3 + .../forestry/models/item/fence/pine.json | 3 + .../forestry/models/item/fence/plum.json | 3 + .../forestry/models/item/fence/poplar.json | 3 + .../forestry/models/item/fence/sequoia.json | 3 + .../forestry/models/item/fence/teak.json | 3 + .../forestry/models/item/fence/walnut.json | 3 + .../forestry/models/item/fence/wenge.json | 3 + .../forestry/models/item/fence/willow.json | 3 + .../forestry/models/item/fence/zebrawood.json | 3 + .../kapok.json => fence_gate/acacia.json} | 2 +- .../lime.json => fence_gate/balsa.json} | 2 +- .../ebony.json => fence_gate/baobab.json} | 2 +- .../balsa.json => fence_gate/cherry.json} | 2 +- .../sequoia.json => fence_gate/chestnut.json} | 2 +- .../larch.json => fence_gate/citrus.json} | 2 +- .../cherry.json => fence_gate/cocobolo.json} | 2 +- .../pine.json => fence_gate/ebony.json} | 2 +- .../giganteum.json} | 2 +- .../greenheart.json} | 2 +- .../forestry/models/item/fence_gate/ipe.json | 39 +++ .../plum.json => fence_gate/kapok.json} | 2 +- .../palm.json => fence_gate/larch.json} | 2 +- .../ipe.json => fence_gate/lime.json} | 2 +- .../models/item/fence_gate/mahoe.json | 39 +++ .../baobab.json => fence_gate/mahogany.json} | 2 +- .../models/item/fence_gate/maple.json | 39 +++ .../models/item/fence_gate/padauk.json | 39 +++ .../forestry/models/item/fence_gate/palm.json | 39 +++ .../models/item/fence_gate/papaya.json | 39 +++ .../forestry/models/item/fence_gate/pine.json | 39 +++ .../forestry/models/item/fence_gate/plum.json | 39 +++ .../models/item/fence_gate/poplar.json | 39 +++ .../acacia.json => fence_gate/sequoia.json} | 2 +- .../{fence_gates => fence_gate}/teak.json | 2 +- .../models/item/fence_gate/walnut.json | 39 +++ .../models/item/fence_gate/wenge.json | 39 +++ .../models/item/fence_gate/willow.json | 39 +++ .../zebrawood.json} | 2 +- .../models/item/fence_gates/citrus.json | 39 --- .../models/item/fence_gates/greenheart.json | 39 --- .../models/item/fence_gates/mahoe.json | 39 --- .../models/item/fence_gates/mahogany.json | 39 --- .../models/item/fence_gates/maple.json | 39 --- .../models/item/fence_gates/padauk.json | 39 --- .../models/item/fence_gates/papaya.json | 39 --- .../models/item/fence_gates/poplar.json | 39 --- .../models/item/fence_gates/walnut.json | 39 --- .../models/item/fence_gates/wenge.json | 39 --- .../models/item/fence_gates/willow.json | 39 --- .../models/item/fence_gates/zebrawood.json | 39 --- .../forestry/models/item/fences/acacia.json | 3 - .../forestry/models/item/fences/balsa.json | 3 - .../forestry/models/item/fences/baobab.json | 3 - .../forestry/models/item/fences/cherry.json | 3 - .../forestry/models/item/fences/chestnut.json | 3 - .../forestry/models/item/fences/citrus.json | 3 - .../forestry/models/item/fences/cocobolo.json | 3 - .../forestry/models/item/fences/ebony.json | 3 - .../models/item/fences/giganteum.json | 3 - .../models/item/fences/greenheart.json | 3 - .../forestry/models/item/fences/ipe.json | 3 - .../forestry/models/item/fences/kapok.json | 3 - .../forestry/models/item/fences/larch.json | 3 - .../forestry/models/item/fences/lime.json | 3 - .../forestry/models/item/fences/mahoe.json | 3 - .../forestry/models/item/fences/mahogany.json | 3 - .../forestry/models/item/fences/maple.json | 3 - .../forestry/models/item/fences/padauk.json | 3 - .../forestry/models/item/fences/palm.json | 3 - .../forestry/models/item/fences/papaya.json | 3 - .../forestry/models/item/fences/pine.json | 3 - .../forestry/models/item/fences/plum.json | 3 - .../forestry/models/item/fences/poplar.json | 3 - .../forestry/models/item/fences/sequoia.json | 3 - .../forestry/models/item/fences/teak.json | 3 - .../forestry/models/item/fences/walnut.json | 3 - .../forestry/models/item/fences/wenge.json | 3 - .../forestry/models/item/fences/willow.json | 3 - .../models/item/fences/zebrawood.json | 3 - .../forestry/models/item/log/acacia.json | 2 +- .../forestry/models/item/log/balsa.json | 2 +- .../forestry/models/item/log/baobab.json | 2 +- .../forestry/models/item/log/cherry.json | 2 +- .../forestry/models/item/log/chestnut.json | 2 +- .../forestry/models/item/log/citrus.json | 2 +- .../forestry/models/item/log/cocobolo.json | 2 +- .../forestry/models/item/log/ebony.json | 2 +- .../forestry/models/item/log/giganteum.json | 2 +- .../forestry/models/item/log/greenheart.json | 2 +- .../assets/forestry/models/item/log/ipe.json | 2 +- .../forestry/models/item/log/kapok.json | 2 +- .../forestry/models/item/log/larch.json | 2 +- .../assets/forestry/models/item/log/lime.json | 2 +- .../forestry/models/item/log/mahoe.json | 2 +- .../forestry/models/item/log/mahogany.json | 2 +- .../forestry/models/item/log/maple.json | 2 +- .../forestry/models/item/log/padauk.json | 2 +- .../assets/forestry/models/item/log/palm.json | 2 +- .../forestry/models/item/log/papaya.json | 2 +- .../assets/forestry/models/item/log/pine.json | 2 +- .../assets/forestry/models/item/log/plum.json | 2 +- .../forestry/models/item/log/poplar.json | 2 +- .../forestry/models/item/log/sequoia.json | 2 +- .../assets/forestry/models/item/log/teak.json | 2 +- .../forestry/models/item/log/walnut.json | 2 +- .../forestry/models/item/log/wenge.json | 2 +- .../forestry/models/item/log/willow.json | 2 +- .../forestry/models/item/log/zebrawood.json | 2 +- 810 files changed, 4041 insertions(+), 3577 deletions(-) rename src/main/java/forestry/api/arboriculture/{EnumWoodType.java => EnumForestryWoodType.java} (77%) create mode 100644 src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java create mode 100644 src/main/java/forestry/api/arboriculture/IWoodType.java create mode 100644 src/main/java/forestry/api/arboriculture/WoodBlockKind.java rename src/main/java/forestry/arboriculture/blocks/{BlockArbFenceGate.java => BlockForestryFenceGate.java} (83%) rename src/main/java/forestry/arboriculture/blocks/{BlockArbStairs.java => BlockForestryStairs.java} (64%) create mode 100644 src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java create mode 100644 src/main/java/forestry/arboriculture/blocks/fence/BlockFireproofVanillaFence.java rename src/main/java/forestry/arboriculture/blocks/{BlockArbFence.java => fence/BlockForestryFence.java} (65%) create mode 100644 src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java create mode 100644 src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java rename src/main/java/forestry/arboriculture/blocks/{BlockArbLog.java => log/BlockForestryLog.java} (52%) create mode 100644 src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java create mode 100644 src/main/java/forestry/arboriculture/blocks/planks/BlockFireproofVanillaPlanks.java rename src/main/java/forestry/arboriculture/blocks/{BlockArbPlanks.java => planks/BlockForestryPlanks.java} (59%) create mode 100644 src/main/java/forestry/arboriculture/blocks/property/PropertyForestryWoodType.java create mode 100644 src/main/java/forestry/arboriculture/blocks/property/PropertyVanillaWoodType.java create mode 100644 src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java create mode 100644 src/main/java/forestry/arboriculture/blocks/slab/BlockFireproofVanillaSlab.java rename src/main/java/forestry/arboriculture/blocks/{BlockArbSlab.java => slab/BlockForestrySlab.java} (60%) create mode 100644 src/main/java/forestry/arboriculture/genetics/WoodProviderFactory.java create mode 100644 src/main/java/forestry/arboriculture/models/ModelProviderFactory.java rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/ebony.json => door/acacia.json} (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/cherry.json => door/balsa.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/balsa.json => door/baobab.json} (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/maple.json => door/cherry.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/baobab.json => door/chestnut.json} (53%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/kapok.json => door/citrus.json} (54%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/cocobolo.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/ebony.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/giganteum.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/giganteum.json => door/greenheart.json} (52%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors => door}/ipe.json (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/pine.json => door/kapok.json} (56%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/larch.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors => door}/lime.json (54%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/mahoe.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/mahogany.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/maple.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/padauk.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors => door}/palm.json (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/larch.json => door/papaya.json} (55%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/pine.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors => door}/plum.json (54%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/poplar.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors/acacia.json => door/sequoia.json} (53%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{doors => door}/teak.json (54%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/walnut.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/wenge.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/willow.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/doors/zebrawood.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/acacia.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/balsa.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/baobab.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/cherry.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/chestnut.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/citrus.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/cocobolo.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/ebony.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/giganteum.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/greenheart.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/ipe.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/kapok.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/larch.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/lime.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/mahoe.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/mahogany.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/maple.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/padauk.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/palm.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/papaya.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/pine.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/plum.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/poplar.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/sequoia.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/teak.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/walnut.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/wenge.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/willow.json (100%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{slab/double => double_slab}/zebrawood.json (100%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/balsa.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/baobab.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/cherry.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/chestnut.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/citrus.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/cocobolo.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/ebony.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/giganteum.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/greenheart.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/ipe.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/kapok.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/larch.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/lime.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahoe.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahogany.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/maple.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/padauk.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/palm.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/papaya.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/pine.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/plum.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/poplar.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/sequoia.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/teak.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/walnut.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/wenge.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/willow.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/zebrawood.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/larch.json => fence_gate/acacia.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/lime.json => fence_gate/balsa.json} (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/ebony.json => fence_gate/baobab.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/balsa.json => fence_gate/cherry.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/sequoia.json => fence_gate/chestnut.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/kapok.json => fence_gate/citrus.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/citrus.json => fence_gate/cocobolo.json} (51%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/pine.json => fence_gate/ebony.json} (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/chestnut.json => fence_gate/giganteum.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/zebrawood.json => fence_gate/greenheart.json} (55%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ipe.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/palm.json => fence_gate/kapok.json} (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/plum.json => fence_gate/larch.json} (54%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/ipe.json => fence_gate/lime.json} (54%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahoe.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/cherry.json => fence_gate/mahogany.json} (51%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/maple.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/padauk.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/palm.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/papaya.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/pine.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/plum.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/poplar.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/acacia.json => fence_gate/sequoia.json} (55%) rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates => fence_gate}/teak.json (51%) create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/walnut.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/wenge.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/willow.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gates/cocobolo.json => fence_gate/zebrawood.json} (55%) delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/acacia_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/acacia_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/acacia_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/acacia_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/balsa_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/balsa_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/balsa_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/balsa_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/baobab_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/baobab_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/baobab_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/baobab_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cherry_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cherry_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cherry_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cherry_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/chestnut_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/chestnut_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/chestnut_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/chestnut_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/citrus_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/citrus_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/citrus_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/citrus_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cocobolo_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cocobolo_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cocobolo_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/cocobolo_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ebony_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ebony_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ebony_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ebony_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/giganteum_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/giganteum_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/giganteum_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/giganteum_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/greenheart_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/greenheart_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/greenheart_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/greenheart_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ipe_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ipe_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ipe_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/ipe_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/kapok_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/kapok_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/kapok_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/kapok_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/larch_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/larch_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/larch_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/larch_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/lime_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/lime_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/lime_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/lime_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahoe_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahoe_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahoe_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahoe_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahogany_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahogany_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahogany_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/mahogany_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/maple_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/maple_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/maple_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/maple_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/padauk_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/padauk_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/padauk_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/padauk_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/palm_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/palm_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/palm_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/palm_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/papaya_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/papaya_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/papaya_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/papaya_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/pine_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/pine_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/pine_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/pine_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/plum_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/plum_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/plum_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/plum_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/poplar_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/poplar_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/poplar_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/poplar_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/sequoia_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/sequoia_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/sequoia_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/sequoia_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/teak_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/teak_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/teak_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/teak_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/walnut_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/walnut_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/walnut_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/walnut_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/wenge_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/wenge_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/wenge_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/wenge_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/willow_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/willow_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/willow_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/willow_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/zebrawood_bottom.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/zebrawood_bottom_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/zebrawood_top.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{doors => door}/zebrawood_top_rh.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/acacia_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/acacia_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/acacia_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/balsa_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/balsa_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/balsa_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/baobab_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/baobab_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/baobab_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/cherry_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/cherry_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/cherry_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/chestnut_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/chestnut_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/chestnut_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/citrus_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/citrus_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/citrus_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/cocobolo_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/cocobolo_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/cocobolo_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/ebony_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/ebony_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/ebony_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/giganteum_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/giganteum_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/giganteum_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/greenheart_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/greenheart_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/greenheart_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/ipe_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/ipe_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/ipe_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/kapok_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/kapok_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/kapok_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/larch_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/larch_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/larch_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/lime_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/lime_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/lime_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/mahoe_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/mahoe_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/mahoe_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/mahogany_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/mahogany_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/mahogany_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/maple_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/maple_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/maple_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/padauk_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/padauk_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/padauk_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/palm_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/palm_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/palm_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/papaya_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/papaya_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/papaya_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/pine_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/pine_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/pine_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/plum_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/plum_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/plum_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/poplar_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/poplar_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/poplar_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/sequoia_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/sequoia_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/sequoia_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/teak_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/teak_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/teak_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/walnut_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/walnut_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/walnut_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/wenge_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/wenge_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/wenge_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/willow_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/willow_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/willow_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/zebrawood_inventory.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/zebrawood_post.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fences => fence}/zebrawood_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/acacia_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/acacia_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/acacia_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/acacia_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/balsa_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/balsa_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/balsa_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/balsa_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/baobab_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/baobab_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/baobab_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/baobab_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cherry_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cherry_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cherry_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cherry_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/chestnut_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/chestnut_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/chestnut_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/chestnut_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/citrus_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/citrus_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/citrus_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/citrus_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cocobolo_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cocobolo_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cocobolo_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/cocobolo_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ebony_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ebony_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ebony_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ebony_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/giganteum_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/giganteum_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/giganteum_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/giganteum_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/greenheart_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/greenheart_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/greenheart_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/greenheart_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ipe_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ipe_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ipe_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/ipe_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/kapok_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/kapok_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/kapok_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/kapok_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/larch_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/larch_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/larch_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/larch_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/lime_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/lime_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/lime_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/lime_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahoe_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahoe_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahoe_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahoe_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahogany_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahogany_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahogany_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/mahogany_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/maple_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/maple_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/maple_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/maple_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/padauk_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/padauk_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/padauk_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/padauk_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/palm_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/palm_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/palm_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/palm_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/papaya_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/papaya_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/papaya_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/papaya_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/pine_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/pine_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/pine_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/pine_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/plum_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/plum_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/plum_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/plum_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/poplar_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/poplar_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/poplar_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/poplar_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/sequoia_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/sequoia_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/sequoia_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/sequoia_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/teak_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/teak_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/teak_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/teak_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/walnut_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/walnut_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/walnut_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/walnut_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/wenge_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/wenge_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/wenge_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/wenge_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/willow_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/willow_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/willow_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/willow_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/zebrawood_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/zebrawood_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/zebrawood_wall_closed.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gates => fence_gate}/zebrawood_wall_open.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/acacia.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/acacia_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/acacia_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/balsa.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/balsa_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/balsa_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/baobab.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/baobab_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/baobab_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/cherry.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/cherry_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/cherry_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/chestnut.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/chestnut_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/chestnut_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/citrus.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/citrus_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/citrus_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/cocobolo.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/cocobolo_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/cocobolo_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/ebony.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/ebony_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/ebony_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/giganteum.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/giganteum_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/giganteum_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/greenheart.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/greenheart_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/greenheart_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/ipe.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/ipe_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/ipe_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/kapok.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/kapok_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/kapok_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/larch.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/larch_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/larch_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/lime.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/lime_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/lime_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/mahoe.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/mahoe_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/mahoe_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/mahogany.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/mahogany_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/mahogany_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/maple.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/maple_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/maple_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/padauk.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/padauk_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/padauk_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/palm.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/palm_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/palm_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/papaya.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/papaya_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/papaya_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/pine.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/pine_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/pine_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/plum.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/plum_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/plum_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/poplar.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/poplar_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/poplar_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/sequoia.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/sequoia_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/sequoia_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/teak.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/teak_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/teak_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/walnut.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/walnut_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/walnut_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/wenge.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/wenge_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/wenge_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/willow.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/willow_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/willow_side.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/zebrawood.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/zebrawood_bark.json (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{logs => log}/zebrawood_side.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/acacia.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/balsa.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/baobab.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/cherry.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/chestnut.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/citrus.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/cocobolo.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/ebony.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/giganteum.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/greenheart.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/ipe.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/kapok.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/larch.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/lime.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/mahoe.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/mahogany.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/maple.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/padauk.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/palm.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/papaya.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/pine.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/plum.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/poplar.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/sequoia.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/teak.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/walnut.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/wenge.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/willow.json (100%) rename src/main/resources/assets/forestry/models/item/{doors => door}/zebrawood.json (100%) create mode 100644 src/main/resources/assets/forestry/models/item/fence/acacia.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/balsa.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/baobab.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/cherry.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/chestnut.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/citrus.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/cocobolo.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/ebony.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/giganteum.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/greenheart.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/ipe.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/kapok.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/larch.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/lime.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/mahoe.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/mahogany.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/poplar.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/sequoia.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/teak.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/willow.json create mode 100644 src/main/resources/assets/forestry/models/item/fence/zebrawood.json rename src/main/resources/assets/forestry/models/item/{fence_gates/kapok.json => fence_gate/acacia.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/lime.json => fence_gate/balsa.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/ebony.json => fence_gate/baobab.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/balsa.json => fence_gate/cherry.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/sequoia.json => fence_gate/chestnut.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/larch.json => fence_gate/citrus.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/cherry.json => fence_gate/cocobolo.json} (87%) rename src/main/resources/assets/forestry/models/item/{fence_gates/pine.json => fence_gate/ebony.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/chestnut.json => fence_gate/giganteum.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/giganteum.json => fence_gate/greenheart.json} (88%) create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/ipe.json rename src/main/resources/assets/forestry/models/item/{fence_gates/plum.json => fence_gate/kapok.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/palm.json => fence_gate/larch.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates/ipe.json => fence_gate/lime.json} (88%) create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json rename src/main/resources/assets/forestry/models/item/{fence_gates/baobab.json => fence_gate/mahogany.json} (87%) create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/maple.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/padauk.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/palm.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/papaya.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/pine.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/plum.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/poplar.json rename src/main/resources/assets/forestry/models/item/{fence_gates/acacia.json => fence_gate/sequoia.json} (88%) rename src/main/resources/assets/forestry/models/item/{fence_gates => fence_gate}/teak.json (87%) create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/walnut.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/wenge.json create mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/willow.json rename src/main/resources/assets/forestry/models/item/{fence_gates/cocobolo.json => fence_gate/zebrawood.json} (88%) delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gates/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/acacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/larch.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/lime.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/palm.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/pine.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/plum.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/teak.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/fences/zebrawood.json diff --git a/lang b/lang index 068161369..4535f8986 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 068161369b4227dffebb8cbae577a395c04f836d +Subproject commit 4535f8986c821d01f008ff349840a7922fec0658 diff --git a/src/main/java/forestry/api/arboriculture/EnumWoodType.java b/src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java similarity index 77% rename from src/main/java/forestry/api/arboriculture/EnumWoodType.java rename to src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java index 785893f04..b2bde961e 100644 --- a/src/main/java/forestry/api/arboriculture/EnumWoodType.java +++ b/src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java @@ -9,9 +9,7 @@ import javax.annotation.Nonnull; import java.util.Locale; import java.util.Random; -import net.minecraft.util.IStringSerializable; - -public enum EnumWoodType implements IStringSerializable { +public enum EnumForestryWoodType implements IWoodType { LARCH, TEAK, ACACIA, LIME, CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f), @@ -25,23 +23,24 @@ public enum EnumWoodType implements IStringSerializable { ZEBRAWOOD; public static final float DEFAULT_HARDNESS = 2.0f; - public static final EnumWoodType[] VALUES = values(); + public static final EnumForestryWoodType[] VALUES = values(); private final float hardness; - EnumWoodType() { - this.hardness = DEFAULT_HARDNESS; + EnumForestryWoodType() { + this(DEFAULT_HARDNESS); } - EnumWoodType(float hardness) { + EnumForestryWoodType(float hardness) { this.hardness = hardness; } + @Override public float getHardness() { return hardness; } - public static EnumWoodType getRandom(Random random) { + public static EnumForestryWoodType getRandom(Random random) { return VALUES[random.nextInt(VALUES.length)]; } @@ -55,12 +54,13 @@ public enum EnumWoodType implements IStringSerializable { return toString(); } + @Override public int getMetadata() { return ordinal(); } @Nonnull - public static EnumWoodType byMetadata(int meta) { + public static EnumForestryWoodType byMetadata(int meta) { if (meta < 0 || meta >= VALUES.length) { meta = 0; } diff --git a/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java b/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java new file mode 100644 index 000000000..9ab6e5a90 --- /dev/null +++ b/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java @@ -0,0 +1,60 @@ +package forestry.api.arboriculture; + +import javax.annotation.Nonnull; +import java.util.Locale; +import java.util.Random; + +import net.minecraft.block.BlockPlanks; + +public enum EnumVanillaWoodType implements IWoodType { + OAK(BlockPlanks.EnumType.OAK), + BIRCH(BlockPlanks.EnumType.BIRCH), + SPRUCE(BlockPlanks.EnumType.SPRUCE), + JUNGLE(BlockPlanks.EnumType.JUNGLE), + ACACIA(BlockPlanks.EnumType.ACACIA), + DARK_OAK(BlockPlanks.EnumType.DARK_OAK); + + public static final EnumVanillaWoodType[] VALUES = values(); + + public static EnumVanillaWoodType getRandom(Random random) { + return VALUES[random.nextInt(VALUES.length)]; + } + + private final BlockPlanks.EnumType vanillaType; + + EnumVanillaWoodType(BlockPlanks.EnumType vanillaType) { + this.vanillaType = vanillaType; + } + + public BlockPlanks.EnumType getVanillaType() { + return vanillaType; + } + + @Override + public String toString() { + return super.toString().toLowerCase(Locale.ENGLISH); + } + + @Override + public String getName() { + return toString(); + } + + @Override + public int getMetadata() { + return ordinal(); + } + + @Nonnull + public static EnumVanillaWoodType byMetadata(int meta) { + if (meta < 0 || meta >= VALUES.length) { + meta = 0; + } + return VALUES[meta]; + } + + @Override + public float getHardness() { + return 2.0F; + } +} diff --git a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java index 434bb0e67..626ea828c 100644 --- a/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java +++ b/src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java @@ -10,6 +10,7 @@ import java.util.Collection; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; + import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,12 +44,6 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies, IAlleleProperty stairs = Arrays.asList( - Blocks.ACACIA_STAIRS, Blocks.BIRCH_STAIRS, Blocks.DARK_OAK_STAIRS, Blocks.JUNGLE_STAIRS, Blocks.SPRUCE_STAIRS - ); - this.stairs = stairs.get(random.nextInt(stairs.size())).getDefaultState(); - - List fences = Arrays.asList( - Blocks.ACACIA_FENCE, Blocks.BIRCH_FENCE, Blocks.DARK_OAK_FENCE, Blocks.JUNGLE_FENCE, Blocks.SPRUCE_FENCE - ); - this.fence = fences.get(random.nextInt(fences.size())).getDefaultState(); - - this.door = Blocks.OAK_DOOR.getDefaultState(); - this.fenceGate = Blocks.OAK_FENCE_GATE.getDefaultState(); + woodType = EnumVanillaWoodType.getRandom(random); } + + IWoodAccess woodAccess = TreeManager.woodAccess; + this.logs = woodAccess.getBlock(woodType, WoodBlockKind.LOG, fireproof).withProperty(BlockLog.LOG_AXIS, BlockLog.EnumAxis.X); + this.planks = woodAccess.getBlock(woodType, WoodBlockKind.PLANKS, fireproof); + this.stairs = woodAccess.getBlock(woodType, WoodBlockKind.STAIRS, fireproof); + this.fence = woodAccess.getBlock(woodType, WoodBlockKind.FENCE, fireproof); + this.door = woodAccess.getBlock(woodType, WoodBlockKind.DOOR, false); + this.fenceGate = woodAccess.getBlock(woodType, WoodBlockKind.FENCE_GATE, fireproof); } private static > IBlockState getRandomVariant(Random random, IBlockState defaultState, IProperty variantProperty) { diff --git a/src/main/java/forestry/arboriculture/IWoodTyped.java b/src/main/java/forestry/arboriculture/IWoodTyped.java index f3a3a2978..1ec1648f5 100755 --- a/src/main/java/forestry/arboriculture/IWoodTyped.java +++ b/src/main/java/forestry/arboriculture/IWoodTyped.java @@ -13,17 +13,18 @@ package forestry.arboriculture; import javax.annotation.Nonnull; import java.util.Collection; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.WoodBlockKind; public interface IWoodTyped { @Nonnull - String getBlockKind(); + WoodBlockKind getBlockKind(); boolean isFireproof(); @Nonnull - EnumWoodType getWoodType(int meta); + IWoodType getWoodType(int meta); @Nonnull - Collection getWoodTypes(); + Collection getWoodTypes(); } diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index fd37fefd3..6396ea03b 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -13,6 +13,7 @@ package forestry.arboriculture; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Set; @@ -39,12 +40,15 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; +import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumPileType; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.ForestryAPI; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ILeafTranslator; @@ -52,10 +56,10 @@ import forestry.api.genetics.ISaplingTranslator; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; -import forestry.arboriculture.blocks.BlockArbLog; -import forestry.arboriculture.blocks.BlockArbSlab; import forestry.arboriculture.blocks.BlockPile; import forestry.arboriculture.blocks.BlockRegistryArboriculture; +import forestry.arboriculture.blocks.log.BlockArbLog; +import forestry.arboriculture.blocks.slab.BlockArbSlab; import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; import forestry.arboriculture.genetics.TreeDefinition; @@ -152,6 +156,13 @@ public class PluginArboriculture extends BlankForestryPlugin { WoodAccess.registerFenceGates(blocks.fenceGatesFireproof); WoodAccess.registerStairs(blocks.stairsFireproof); + WoodAccess.registerLogs(blocks.logsVanillaFireproof); + WoodAccess.registerPlanks(blocks.planksVanillaFireproof); + WoodAccess.registerSlabs(blocks.slabsVanillaFireproof); + WoodAccess.registerFences(blocks.fencesVanillaFireproof); + WoodAccess.registerFenceGates(blocks.fenceGatesVanillaFireproof); + WoodAccess.registerStairs(blocks.stairsVanillaFireproof); + // Init rendering proxy.initializeModels(); @@ -227,35 +238,69 @@ public class PluginArboriculture extends BlankForestryPlugin { RecipeUtil.addSmelting(logInput, coalOutput, 0.15F); } - for (EnumWoodType woodType : EnumWoodType.VALUES) { - ItemStack planks = TreeManager.woodAccess.getPlanks(woodType, false); - ItemStack logs = TreeManager.woodAccess.getLog(woodType, false); - ItemStack slabs = TreeManager.woodAccess.getSlab(woodType, false); - ItemStack fences = TreeManager.woodAccess.getFence(woodType, false); - ItemStack fenceGates = TreeManager.woodAccess.getFenceGate(woodType, false); - ItemStack stairs = TreeManager.woodAccess.getStairs(woodType, false); - ItemStack doors = TreeManager.woodAccess.getDoor(woodType); + List allWoodTypes = new ArrayList<>(); + Collections.addAll(allWoodTypes, EnumForestryWoodType.VALUES); + Collections.addAll(allWoodTypes, EnumVanillaWoodType.VALUES); - ItemStack fireproofPlanks = TreeManager.woodAccess.getPlanks(woodType, true); - ItemStack fireproofLogs = TreeManager.woodAccess.getLog(woodType, true); - ItemStack fireproofSlabs = TreeManager.woodAccess.getSlab(woodType, true); - ItemStack fireproofFences = TreeManager.woodAccess.getFence(woodType, true); - ItemStack fireproofFenceGates = TreeManager.woodAccess.getFenceGate(woodType, true); - ItemStack fireproofStairs = TreeManager.woodAccess.getStairs(woodType, true); + for (IWoodType woodType : allWoodTypes) { + ItemStack planks = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, false); + ItemStack logs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, false); + ItemStack slabs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.SLAB, false); + ItemStack fences = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, false); + ItemStack fenceGates = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE_GATE, false); + ItemStack stairs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.STAIRS, false); + ItemStack doors = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.DOOR, false); - planks.stackSize = 4; - logs.stackSize = 1; - RecipeUtil.addShapelessRecipe(planks.copy(), logs.copy()); + ItemStack fireproofPlanks = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, true); + ItemStack fireproofLogs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, true); + ItemStack fireproofSlabs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.SLAB, true); + ItemStack fireproofFences = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE, true); + ItemStack fireproofFenceGates = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.FENCE_GATE, true); + ItemStack fireproofStairs = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.STAIRS, true); + + if (woodType instanceof EnumForestryWoodType) { + planks.stackSize = 4; + logs.stackSize = 1; + RecipeUtil.addShapelessRecipe(planks.copy(), logs.copy()); + + slabs.stackSize = 6; + planks.stackSize = 1; + RecipeUtil.addPriorityRecipe(slabs.copy(), "###", '#', planks.copy()); + + fences.stackSize = 3; + planks.stackSize = 1; + RecipeUtil.addRecipe(fences.copy(), + "#X#", + "#X#", + '#', planks.copy(), 'X', "stickWood"); + + fenceGates.stackSize = 1; + planks.stackSize = 1; + RecipeUtil.addRecipe(fenceGates.copy(), + "X#X", + "X#X", + '#', planks.copy(), 'X', "stickWood"); + + stairs.stackSize = 4; + planks.stackSize = 1; + RecipeUtil.addPriorityRecipe(stairs.copy(), + "# ", + "## ", + "###", + '#', planks.copy()); + + doors.stackSize = 3; + planks.stackSize = 1; + RecipeUtil.addPriorityRecipe(doors.copy(), + "## ", + "## ", + "## ", + '#', planks.copy()); + } fireproofPlanks.stackSize = 4; fireproofLogs.stackSize = 1; RecipeUtil.addShapelessRecipe(fireproofPlanks.copy(), fireproofLogs.copy()); - - slabs.stackSize = 6; - planks.stackSize = 1; - RecipeUtil.addPriorityRecipe(slabs.copy(), - "###", - '#', planks.copy()); fireproofSlabs.stackSize = 6; fireproofPlanks.stackSize = 1; @@ -263,26 +308,12 @@ public class PluginArboriculture extends BlankForestryPlugin { "###", '#', fireproofPlanks.copy()); - fences.stackSize = 3; - planks.stackSize = 1; - RecipeUtil.addRecipe(fences.copy(), - "#X#", - "#X#", - '#', planks.copy(), 'X', "stickWood"); - fireproofFences.stackSize = 3; fireproofPlanks.stackSize = 1; RecipeUtil.addRecipe(fireproofFences.copy(), "#X#", "#X#", '#', fireproofPlanks.copy(), 'X', "stickWood"); - - fenceGates.stackSize = 1; - planks.stackSize = 1; - RecipeUtil.addRecipe(fenceGates.copy(), - "X#X", - "X#X", - '#', planks.copy(), 'X', "stickWood"); fireproofFenceGates.stackSize = 1; fireproofPlanks.stackSize = 1; @@ -291,14 +322,6 @@ public class PluginArboriculture extends BlankForestryPlugin { "X#X", '#', fireproofPlanks.copy(), 'X', "stickWood"); - stairs.stackSize = 4; - planks.stackSize = 1; - RecipeUtil.addPriorityRecipe(stairs.copy(), - "# ", - "## ", - "###", - '#', planks.copy()); - fireproofStairs.stackSize = 4; fireproofPlanks.stackSize = 1; RecipeUtil.addPriorityRecipe(fireproofStairs.copy(), @@ -307,14 +330,6 @@ public class PluginArboriculture extends BlankForestryPlugin { "###", '#', fireproofPlanks.copy()); - doors.stackSize = 3; - planks.stackSize = 1; - RecipeUtil.addPriorityRecipe(doors.copy(), - "## ", - "## ", - "## ", - '#', planks.copy()); - doors.stackSize = 3; fireproofPlanks.stackSize = 1; RecipeUtil.addPriorityRecipe(doors.copy(), diff --git a/src/main/java/forestry/arboriculture/VillagerArboristTrades.java b/src/main/java/forestry/arboriculture/VillagerArboristTrades.java index d7e83ba7c..5e24d9573 100644 --- a/src/main/java/forestry/arboriculture/VillagerArboristTrades.java +++ b/src/main/java/forestry/arboriculture/VillagerArboristTrades.java @@ -13,9 +13,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; +import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; @@ -47,8 +48,8 @@ public class VillagerArboristTrades { j = this.emeraldPriceInfo.getPrice(random); } - EnumWoodType woodType = EnumWoodType.getRandom(random); - ItemStack sellStack = TreeManager.woodAccess.getLog(woodType, false); + EnumForestryWoodType woodType = EnumForestryWoodType.getRandom(random); + ItemStack sellStack = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, false); sellStack.stackSize = i; ItemStack emeralds = new ItemStack(Items.EMERALD, j); @@ -80,8 +81,8 @@ public class VillagerArboristTrades { j = this.emeraldPriceInfo.getPrice(random); } - EnumWoodType woodType = EnumWoodType.getRandom(random); - ItemStack sellStack = TreeManager.woodAccess.getPlanks(woodType, false); + EnumForestryWoodType woodType = EnumForestryWoodType.getRandom(random); + ItemStack sellStack = TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, false); sellStack.stackSize = i; ItemStack emeralds = new ItemStack(Items.EMERALD, j); diff --git a/src/main/java/forestry/arboriculture/WoodAccess.java b/src/main/java/forestry/arboriculture/WoodAccess.java index f80cf1346..71f9ab660 100644 --- a/src/main/java/forestry/arboriculture/WoodAccess.java +++ b/src/main/java/forestry/arboriculture/WoodAccess.java @@ -12,230 +12,226 @@ package forestry.arboriculture; import javax.annotation.Nonnull; import java.util.EnumMap; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.BlockNewLog; +import net.minecraft.block.BlockOldLog; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockWoodSlab; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IWoodAccess; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.WoodBlockKind; import forestry.arboriculture.blocks.BlockArbDoor; -import forestry.arboriculture.blocks.BlockArbFence; -import forestry.arboriculture.blocks.BlockArbFenceGate; -import forestry.arboriculture.blocks.BlockArbLog; -import forestry.arboriculture.blocks.BlockArbPlanks; -import forestry.arboriculture.blocks.BlockArbSlab; -import forestry.arboriculture.blocks.BlockArbStairs; +import forestry.arboriculture.blocks.BlockForestryFenceGate; +import forestry.arboriculture.blocks.BlockForestryStairs; +import forestry.arboriculture.blocks.fence.BlockForestryFence; +import forestry.arboriculture.blocks.log.BlockForestryLog; +import forestry.arboriculture.blocks.planks.BlockForestryPlanks; import forestry.arboriculture.blocks.property.PropertyWoodType; +import forestry.arboriculture.blocks.slab.BlockForestrySlab; import forestry.core.utils.Log; public class WoodAccess implements IWoodAccess { - private static final WoodMap logs = new WoodMap("logs"); - private static final WoodMap planks = new WoodMap("planks"); - private static final WoodMap slabs = new WoodMap("slabs"); - private static final WoodMap fences = new WoodMap("fences"); - private static final WoodMap fenceGates = new WoodMap("fenceGates"); - private static final WoodMap stairs = new WoodMap("stairs"); - private static final WoodMap doors = new WoodMap("doors") { - @Nonnull - @Override - public EnumMap getItem(boolean fireproof) { - return super.getItem(false); - } + private static final Map woodMaps = new EnumMap<>(WoodBlockKind.class); - @Nonnull - @Override - public EnumMap getBlock(boolean fireproof) { - return super.getBlock(false); + static { + for (WoodBlockKind woodBlockKind : WoodBlockKind.values()) { + woodMaps.put(woodBlockKind, new WoodMap(woodBlockKind)); } - }; + registerVanilla(); + } private static class WoodMap { @Nonnull - private final EnumMap normalItems = new EnumMap<>(EnumWoodType.class); + private final Map normalItems = new HashMap<>(); @Nonnull - private final EnumMap fireproofItems = new EnumMap<>(EnumWoodType.class); + private final Map fireproofItems = new HashMap<>(); @Nonnull - private final EnumMap normalBlocks = new EnumMap<>(EnumWoodType.class); + private final Map normalBlocks = new HashMap<>(); @Nonnull - private final EnumMap fireproofBlocks = new EnumMap<>(EnumWoodType.class); + private final Map fireproofBlocks = new HashMap<>(); @Nonnull - private final String name; + private final WoodBlockKind woodBlockKind; - public WoodMap(@Nonnull String name) { - this.name = name; + public WoodMap(@Nonnull WoodBlockKind woodBlockKind) { + this.woodBlockKind = woodBlockKind; } @Nonnull public String getName() { - return name; + return woodBlockKind.name(); } @Nonnull - public EnumMap getItem(boolean fireproof) { + public Map getItem(boolean fireproof) { return fireproof ? this.fireproofItems : this.normalItems; } @Nonnull - public EnumMap getBlock(boolean fireproof) { + public Map getBlock(boolean fireproof) { return fireproof ? this.fireproofBlocks : this.normalBlocks; } } - public static void registerLogs(List blocks) { - for (BlockArbLog block : blocks) { - registerWithVariants(block, logs, block.getVariant()); + public static void registerLogs(List blocks) { + for (BlockForestryLog block : blocks) { + registerWithVariants(block, WoodBlockKind.LOG, block.getVariant()); } } - public static void registerPlanks(List blocks) { - for (BlockArbPlanks block : blocks) { - registerWithVariants(block, planks, block.getVariant()); + public static void registerPlanks(List blocks) { + for (BlockForestryPlanks block : blocks) { + registerWithVariants(block, WoodBlockKind.PLANKS, block.getVariant()); } } - public static void registerSlabs(List blocks) { - for (BlockArbSlab block : blocks) { - registerWithVariants(block, slabs, block.getVariant()); + public static void registerSlabs(List blocks) { + for (BlockForestrySlab block : blocks) { + registerWithVariants(block, WoodBlockKind.SLAB, block.getVariant()); } } - public static void registerFences(List blocks) { - for (BlockArbFence block : blocks) { - registerWithVariants(block, fences, block.getVariant()); + public static void registerFences(List blocks) { + for (BlockForestryFence block : blocks) { + registerWithVariants(block, WoodBlockKind.FENCE, block.getVariant()); } } - public static void registerFenceGates(List blocks) { - for (BlockArbFenceGate block : blocks) { - registerWithoutVariants(block, fenceGates); + public static void registerFenceGates(List blocks) { + for (BlockForestryFenceGate block : blocks) { + registerWithoutVariants(block, WoodBlockKind.FENCE_GATE); } } - public static void registerStairs(List blocks) { - for (BlockArbStairs block : blocks) { - registerWithoutVariants(block, stairs); + public static void registerStairs(List blocks) { + for (BlockForestryStairs block : blocks) { + registerWithoutVariants(block, WoodBlockKind.STAIRS); } } public static void registerDoors(List blocks) { for (BlockArbDoor block : blocks) { - registerWithoutVariants(block, doors); + registerWithoutVariants(block, WoodBlockKind.DOOR); } } - private static void registerWithVariants(T woodTyped, WoodMap woodMap, PropertyWoodType property) { + private static void registerVanilla() { + IBlockState defaultLogState = Blocks.LOG.getDefaultState(); + register(EnumVanillaWoodType.OAK, WoodBlockKind.LOG, false, defaultLogState.withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.OAK), new ItemStack(Blocks.LOG, 1, 0)); + register(EnumVanillaWoodType.BIRCH, WoodBlockKind.LOG, false, defaultLogState.withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.BIRCH), new ItemStack(Blocks.LOG, 1, 1)); + register(EnumVanillaWoodType.SPRUCE, WoodBlockKind.LOG, false, defaultLogState.withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.SPRUCE), new ItemStack(Blocks.LOG, 1, 2)); + register(EnumVanillaWoodType.JUNGLE, WoodBlockKind.LOG, false, defaultLogState.withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.JUNGLE), new ItemStack(Blocks.LOG, 1, 3)); + IBlockState defaultLog2State = Blocks.LOG2.getDefaultState(); + register(EnumVanillaWoodType.ACACIA, WoodBlockKind.LOG, false, defaultLog2State.withProperty(BlockNewLog.VARIANT, BlockPlanks.EnumType.ACACIA), new ItemStack(Blocks.LOG2, 1, 0)); + register(EnumVanillaWoodType.DARK_OAK, WoodBlockKind.LOG, false, defaultLog2State.withProperty(BlockNewLog.VARIANT, BlockPlanks.EnumType.DARK_OAK), new ItemStack(Blocks.LOG2, 1, 1)); + + IBlockState defaultPlanksState = Blocks.PLANKS.getDefaultState(); + IBlockState defaultSlabState = Blocks.WOODEN_SLAB.getDefaultState(); + for (EnumVanillaWoodType woodType : EnumVanillaWoodType.VALUES) { + BlockPlanks.EnumType vanillaType = woodType.getVanillaType(); + + ItemStack plankStack = new ItemStack(Blocks.PLANKS, 1, vanillaType.getMetadata()); + IBlockState plankState = defaultPlanksState.withProperty(BlockPlanks.VARIANT, vanillaType); + register(woodType, WoodBlockKind.PLANKS, false, plankState, plankStack); + + ItemStack slabStack = new ItemStack(Blocks.WOODEN_SLAB, 1, vanillaType.getMetadata()); + IBlockState slabState = defaultSlabState.withProperty(BlockWoodSlab.VARIANT, vanillaType); + register(woodType, WoodBlockKind.SLAB, false, slabState, slabStack); + } + + register(EnumVanillaWoodType.OAK, WoodBlockKind.FENCE, false, Blocks.OAK_FENCE.getDefaultState(), new ItemStack(Blocks.OAK_FENCE)); + register(EnumVanillaWoodType.BIRCH, WoodBlockKind.FENCE, false, Blocks.BIRCH_FENCE.getDefaultState(), new ItemStack(Blocks.BIRCH_FENCE)); + register(EnumVanillaWoodType.SPRUCE, WoodBlockKind.FENCE, false, Blocks.SPRUCE_FENCE.getDefaultState(), new ItemStack(Blocks.SPRUCE_FENCE)); + register(EnumVanillaWoodType.JUNGLE, WoodBlockKind.FENCE, false, Blocks.JUNGLE_FENCE.getDefaultState(), new ItemStack(Blocks.JUNGLE_FENCE)); + register(EnumVanillaWoodType.ACACIA, WoodBlockKind.FENCE, false, Blocks.ACACIA_FENCE.getDefaultState(), new ItemStack(Blocks.ACACIA_FENCE)); + register(EnumVanillaWoodType.DARK_OAK, WoodBlockKind.FENCE, false, Blocks.DARK_OAK_FENCE.getDefaultState(), new ItemStack(Blocks.DARK_OAK_FENCE)); + + register(EnumVanillaWoodType.OAK, WoodBlockKind.FENCE_GATE, false, Blocks.OAK_FENCE_GATE.getDefaultState(), new ItemStack(Blocks.OAK_FENCE_GATE)); + register(EnumVanillaWoodType.BIRCH, WoodBlockKind.FENCE_GATE, false, Blocks.BIRCH_FENCE_GATE.getDefaultState(), new ItemStack(Blocks.BIRCH_FENCE_GATE)); + register(EnumVanillaWoodType.SPRUCE, WoodBlockKind.FENCE_GATE, false, Blocks.SPRUCE_FENCE_GATE.getDefaultState(), new ItemStack(Blocks.SPRUCE_FENCE_GATE)); + register(EnumVanillaWoodType.JUNGLE, WoodBlockKind.FENCE_GATE, false, Blocks.JUNGLE_FENCE_GATE.getDefaultState(), new ItemStack(Blocks.JUNGLE_FENCE_GATE)); + register(EnumVanillaWoodType.ACACIA, WoodBlockKind.FENCE_GATE, false, Blocks.ACACIA_FENCE_GATE.getDefaultState(), new ItemStack(Blocks.ACACIA_FENCE_GATE)); + register(EnumVanillaWoodType.DARK_OAK, WoodBlockKind.FENCE_GATE, false, Blocks.DARK_OAK_FENCE_GATE.getDefaultState(), new ItemStack(Blocks.DARK_OAK_FENCE_GATE)); + + register(EnumVanillaWoodType.OAK, WoodBlockKind.STAIRS, false, Blocks.OAK_STAIRS.getDefaultState(), new ItemStack(Blocks.OAK_STAIRS)); + register(EnumVanillaWoodType.BIRCH, WoodBlockKind.STAIRS, false, Blocks.BIRCH_STAIRS.getDefaultState(), new ItemStack(Blocks.BIRCH_STAIRS)); + register(EnumVanillaWoodType.SPRUCE, WoodBlockKind.STAIRS, false, Blocks.SPRUCE_STAIRS.getDefaultState(), new ItemStack(Blocks.SPRUCE_STAIRS)); + register(EnumVanillaWoodType.JUNGLE, WoodBlockKind.STAIRS, false, Blocks.JUNGLE_STAIRS.getDefaultState(), new ItemStack(Blocks.JUNGLE_STAIRS)); + register(EnumVanillaWoodType.ACACIA, WoodBlockKind.STAIRS, false, Blocks.ACACIA_STAIRS.getDefaultState(), new ItemStack(Blocks.ACACIA_STAIRS)); + register(EnumVanillaWoodType.DARK_OAK, WoodBlockKind.STAIRS, false, Blocks.DARK_OAK_STAIRS.getDefaultState(), new ItemStack(Blocks.DARK_OAK_STAIRS)); + + register(EnumVanillaWoodType.OAK, WoodBlockKind.DOOR, false, Blocks.OAK_DOOR.getDefaultState(), new ItemStack(Items.OAK_DOOR)); + register(EnumVanillaWoodType.BIRCH, WoodBlockKind.DOOR, false, Blocks.BIRCH_DOOR.getDefaultState(), new ItemStack(Items.BIRCH_DOOR)); + register(EnumVanillaWoodType.SPRUCE, WoodBlockKind.DOOR, false, Blocks.SPRUCE_DOOR.getDefaultState(), new ItemStack(Items.SPRUCE_DOOR)); + register(EnumVanillaWoodType.JUNGLE, WoodBlockKind.DOOR, false, Blocks.JUNGLE_DOOR.getDefaultState(), new ItemStack(Items.JUNGLE_DOOR)); + register(EnumVanillaWoodType.ACACIA, WoodBlockKind.DOOR, false, Blocks.ACACIA_DOOR.getDefaultState(), new ItemStack(Items.ACACIA_DOOR)); + register(EnumVanillaWoodType.DARK_OAK, WoodBlockKind.DOOR, false, Blocks.DARK_OAK_DOOR.getDefaultState(), new ItemStack(Items.DARK_OAK_DOOR)); + } + + private static & IWoodType> void registerWithVariants(T woodTyped, WoodBlockKind woodBlockKind, PropertyWoodType property) { boolean fireproof = woodTyped.isFireproof(); - EnumMap itemRegistryMap = woodMap.getItem(fireproof); - EnumMap blockRegistryMap = woodMap.getBlock(fireproof); - for (EnumWoodType value : property.getAllowedValues()) { + + for (V value : property.getAllowedValues()) { IBlockState blockState = woodTyped.getDefaultState().withProperty(property, value); int meta = woodTyped.getMetaFromState(blockState); - EnumWoodType woodType = woodTyped.getWoodType(meta); + IWoodType woodType = woodTyped.getWoodType(meta); ItemStack itemStack = new ItemStack(woodTyped, 1, meta); - - itemRegistryMap.put(woodType, itemStack); - blockRegistryMap.put(woodType, blockState); + register(woodType, woodBlockKind, fireproof, blockState, itemStack); } } /** * Register wood blocks that have no variant property */ - private static , V extends P> void registerWithoutVariants(T woodTyped, WoodMap woodMap) { + private static void registerWithoutVariants(T woodTyped, WoodBlockKind woodBlockKind) { boolean fireproof = woodTyped.isFireproof(); - EnumMap itemRegistryMap = woodMap.getItem(fireproof); - EnumMap blockRegistryMap = woodMap.getBlock(fireproof); - IBlockState blockState = woodTyped.getDefaultState(); - EnumWoodType woodType = woodTyped.getWoodType(0); + IWoodType woodType = woodTyped.getWoodType(0); ItemStack itemStack = new ItemStack(woodTyped); + register(woodType, woodBlockKind, fireproof, blockState, itemStack); + } - itemRegistryMap.put(woodType, itemStack); - blockRegistryMap.put(woodType, blockState); + private static void register(IWoodType woodType, WoodBlockKind woodBlockKind, boolean fireproof, IBlockState blockState, ItemStack itemStack) { + if (woodBlockKind == WoodBlockKind.DOOR) { + fireproof = true; + } + if (itemStack == null || itemStack.getItem() == null) { + throw new NullPointerException("Invalid itemStack: " + itemStack); + } + WoodMap woodMap = woodMaps.get(woodBlockKind); + woodMap.getItem(fireproof).put(woodType, itemStack); + woodMap.getBlock(fireproof).put(woodType, blockState); } @Override - public ItemStack getPlanks(EnumWoodType woodType, boolean fireproof) { - return getItem(woodType, fireproof, planks); - } - - @Override - public ItemStack getLog(EnumWoodType woodType, boolean fireproof) { - return getItem(woodType, fireproof, logs); - } - - @Override - public ItemStack getSlab(EnumWoodType woodType, boolean fireproof) { - return getItem(woodType, fireproof, slabs); - } - - @Override - public ItemStack getFence(EnumWoodType woodType, boolean fireproof) { - return getItem(woodType, fireproof, fences); - } - - @Override - public ItemStack getFenceGate(EnumWoodType woodType, boolean fireproof) { - return getItem(woodType, fireproof, fenceGates); - } - - @Override - public ItemStack getStairs(EnumWoodType woodType, boolean fireproof) { - return getItem(woodType, fireproof, stairs); - } - - @Override - public ItemStack getDoor(EnumWoodType woodType) { - return getItem(woodType, false, doors); - } - - @Override - public IBlockState getLogBlock(EnumWoodType woodType, boolean fireproof) { - return getBlock(woodType, fireproof, logs); - } - - @Override - public IBlockState getPlanksBlock(EnumWoodType woodType, boolean fireproof) { - return getBlock(woodType, fireproof, planks); - } - - @Override - public IBlockState getSlabBlock(EnumWoodType woodType, boolean fireproof) { - return getBlock(woodType, fireproof, slabs); - } - - @Override - public IBlockState getFenceBlock(EnumWoodType woodType, boolean fireproof) { - return getBlock(woodType, fireproof, fences); - } - - @Override - public IBlockState getFenceGateBlock(EnumWoodType woodType, boolean fireproof) { - return getBlock(woodType, fireproof, fenceGates); - } - - @Override - public IBlockState getStairsBlock(EnumWoodType woodType, boolean fireproof) { - return getBlock(woodType, fireproof, stairs); - } - - @Override - public IBlockState getDoorBlock(EnumWoodType woodType) { - return getBlock(woodType, false, doors); - } - - private static ItemStack getItem(EnumWoodType woodType, boolean fireproof, WoodMap woodMap) { + public ItemStack getStack(IWoodType woodType, WoodBlockKind woodBlockKind, boolean fireproof) { + if (woodBlockKind == WoodBlockKind.DOOR) { + fireproof = true; + } + WoodMap woodMap = woodMaps.get(woodBlockKind); ItemStack itemStack = woodMap.getItem(fireproof).get(woodType); if (itemStack == null) { - Log.error("No stack found for {} {} {}", woodType, woodMap.getName(), fireproof ? "fireproof" : "non-fireproof"); + Log.error("No stack found for {} {} {}", woodType, woodMap.getName(), fireproof ? "fireproof" : ""); return null; } return itemStack.copy(); } - private static IBlockState getBlock(EnumWoodType woodType, boolean fireproof, WoodMap woodMap) { + @Override + public IBlockState getBlock(IWoodType woodType, WoodBlockKind woodBlockKind, boolean fireproof) { + if (woodBlockKind == WoodBlockKind.DOOR) { + fireproof = true; + } + WoodMap woodMap = woodMaps.get(woodBlockKind); IBlockState blockState = woodMap.getBlock(fireproof).get(woodType); if (blockState == null) { Log.error("No block found for {} {} {}", woodType, woodMap.getName(), fireproof ? "fireproof" : "non-fireproof"); diff --git a/src/main/java/forestry/arboriculture/WoodHelper.java b/src/main/java/forestry/arboriculture/WoodHelper.java index a6234b5ae..9f5affd5a 100644 --- a/src/main/java/forestry/arboriculture/WoodHelper.java +++ b/src/main/java/forestry/arboriculture/WoodHelper.java @@ -4,6 +4,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.BlockFenceGate; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; @@ -12,25 +13,36 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.ForestryAPI; -import forestry.core.render.ForestryResource; +import forestry.core.config.Constants; import forestry.core.utils.Translator; public class WoodHelper { @Nonnull - public static String getDisplayName(IWoodTyped wood, EnumWoodType woodType) { - String blockKind = wood.getBlockKind(); + public static String getDisplayName(IWoodTyped wood, IWoodType woodType) { + WoodBlockKind blockKind = wood.getBlockKind(); String displayName; - String customUnlocalizedName = "tile.for." + blockKind + "." + woodType.ordinal() + ".name"; - if (Translator.canTranslateToLocal(customUnlocalizedName)) { - displayName = Translator.translateToLocal(customUnlocalizedName); - } else { - String woodGrammar = Translator.translateToLocal("for." + blockKind + ".grammar"); - String woodTypeName = Translator.translateToLocal("for.trees.woodType." + woodType); - displayName = woodGrammar.replaceAll("%TYPE", woodTypeName); + if (woodType instanceof EnumForestryWoodType) { + String customUnlocalizedName = "tile.for." + blockKind + "." + woodType + ".name"; + if (Translator.canTranslateToLocal(customUnlocalizedName)) { + displayName = Translator.translateToLocal(customUnlocalizedName); + } else { + String woodGrammar = Translator.translateToLocal("for." + blockKind + ".grammar"); + String woodTypeName = Translator.translateToLocal("for.trees.woodType." + woodType); + + displayName = woodGrammar.replaceAll("%TYPE", woodTypeName); + } + } else if (woodType instanceof EnumVanillaWoodType) { + displayName = TreeManager.woodAccess.getStack(woodType, blockKind, false).getDisplayName(); + } else { + throw new IllegalArgumentException("Unknown wood type: " + woodType); } if (wood.isFireproof()) { @@ -42,9 +54,13 @@ public class WoodHelper { public static ResourceLocation[] getResourceLocations(IWoodTyped typed) { List resourceLocations = new ArrayList<>(); - String blockKind = typed.getBlockKind(); - for (EnumWoodType woodType : typed.getWoodTypes()) { - resourceLocations.add(new ForestryResource(blockKind + "/" + woodType)); + WoodBlockKind blockKind = typed.getBlockKind(); + for (IWoodType woodType : typed.getWoodTypes()) { + if (woodType instanceof EnumForestryWoodType) { + resourceLocations.add(new ResourceLocation(Constants.RESOURCE_ID, blockKind + "/" + woodType)); + } else if (woodType instanceof EnumVanillaWoodType) { + resourceLocations.add(new ResourceLocation("minecraft", woodType + "_" + blockKind)); + } } return resourceLocations.toArray(new ResourceLocation[resourceLocations.size()]); } @@ -61,9 +77,15 @@ public class WoodHelper { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { int meta = stack.getMetadata(); - EnumWoodType woodType = wood.getWoodType(meta); - String blockKind = wood.getBlockKind(); - return ForestryAPI.modelManager.getModelLocation(blockKind + "/" + woodType); + IWoodType woodType = wood.getWoodType(meta); + WoodBlockKind blockKind = wood.getBlockKind(); + if (woodType instanceof EnumForestryWoodType) { + return ForestryAPI.modelManager.getModelLocation(blockKind + "/" + woodType); + } else if (woodType instanceof EnumVanillaWoodType) { + return new ModelResourceLocation("minecraft:" + woodType + "_" + blockKind, "inventory"); + } else { + throw new IllegalArgumentException("Unknown wood type: " + woodType); + } } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java index 21b24aeb2..2ba13e6d1 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java @@ -16,7 +16,6 @@ import java.util.Collections; import java.util.Random; import net.minecraft.block.BlockDoor; -import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -26,8 +25,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; @@ -37,9 +37,9 @@ import forestry.arboriculture.WoodHelper; import forestry.core.proxy.Proxies; public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelRegister, IStateMapperRegister { - private final EnumWoodType woodType; + private final EnumForestryWoodType woodType; - public BlockArbDoor(EnumWoodType woodType) { + public BlockArbDoor(EnumForestryWoodType woodType) { super(MaterialArbWood.ARB_WOOD); this.woodType = woodType; @@ -62,8 +62,8 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg @Nonnull @Override - public String getBlockKind() { - return "doors"; + public WoodBlockKind getBlockKind() { + return WoodBlockKind.DOOR; } @Override @@ -73,20 +73,20 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg @Nonnull @Override - public EnumWoodType getWoodType(int meta) { + public EnumForestryWoodType getWoodType(int meta) { return woodType; } @Nonnull @Override - public Collection getWoodTypes() { + public Collection getWoodTypes() { return Collections.singleton(woodType); } @Override public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + EnumForestryWoodType woodType = getWoodType(meta); return woodType.getHardness(); } @@ -105,6 +105,6 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg } private Item getItem() { - return TreeManager.woodAccess.getDoor(woodType).getItem(); + return TreeManager.woodAccess.getStack(woodType, getBlockKind(), false).getItem(); } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java similarity index 83% rename from src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java rename to src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java index 10348ab9b..75fab7ab3 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java @@ -10,14 +10,30 @@ ******************************************************************************/ package forestry.arboriculture.blocks; +import javax.annotation.Nonnull; import java.util.Collection; import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockPlanks.EnumType; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import forestry.api.arboriculture.EnumWoodType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; @@ -26,28 +42,14 @@ import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; import forestry.arboriculture.WoodHelper.WoodMeshDefinition; import forestry.core.proxy.Proxies; -import net.minecraft.block.BlockFenceGate; -import net.minecraft.block.BlockPlanks.EnumType; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.block.SoundType; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -public class BlockArbFenceGate extends BlockFenceGate implements IWoodTyped, IItemModelRegister, IStateMapperRegister { - +public class BlockForestryFenceGate & IWoodType> extends BlockFenceGate implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + private final boolean fireproof; - private final EnumWoodType woodType; + private final T woodType; - public BlockArbFenceGate(boolean fireproof, EnumWoodType woodType){ - super(EnumType.OAK); + public BlockForestryFenceGate(boolean fireproof, T woodType) { + super(EnumType.OAK); this.fireproof = fireproof; this.woodType = woodType; @@ -85,19 +87,19 @@ public class BlockArbFenceGate extends BlockFenceGate implements IWoodTyped, IIt @Nonnull @Override - public String getBlockKind() { - return "fence_gates"; + public WoodBlockKind getBlockKind() { + return WoodBlockKind.FENCE_GATE; } @Nonnull @Override - public EnumWoodType getWoodType(int meta) { + public T getWoodType(int meta) { return woodType; } @Nonnull @Override - public Collection getWoodTypes() { + public Collection getWoodTypes() { return Collections.singleton(woodType); } @@ -109,13 +111,13 @@ public class BlockArbFenceGate extends BlockFenceGate implements IWoodTyped, IIt @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - list.add(TreeManager.woodAccess.getFenceGate(woodType, fireproof)); + list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } @Override public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return woodType.getHardness(); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java similarity index 64% rename from src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java rename to src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java index 01c5eab86..ab37b0c49 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java @@ -1,13 +1,3 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ package forestry.arboriculture.blocks; import javax.annotation.Nonnull; @@ -18,35 +8,36 @@ import net.minecraft.block.BlockStairs; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.WoodHelper.WoodMeshDefinition; import forestry.core.proxy.Proxies; -public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemModelRegister, IStateMapperRegister { +public class BlockForestryStairs & IWoodType> extends BlockStairs implements IWoodTyped, IItemModelRegister, IStateMapperRegister { private final boolean fireproof; - private final EnumWoodType woodType; + private final T woodType; - public BlockArbStairs(boolean fireproof, IBlockState modelState, EnumWoodType woodType) { + public BlockForestryStairs(boolean fireproof, IBlockState modelState, T woodType) { super(modelState); this.fireproof = fireproof; this.woodType = woodType; setCreativeTab(Tabs.tabArboriculture); setHarvestLevel("axe", 0); } - + @Override public Material getMaterial(IBlockState state) { return MaterialArbWood.ARB_WOOD; @@ -57,7 +48,13 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemMode @Override public void registerModel(Item item, IModelManager manager) { manager.registerVariant(item, WoodHelper.getResourceLocations(this)); - manager.registerItemModel(item, new WoodMeshDefinition(this)); + manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, null)); } @Override @@ -67,32 +64,26 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemMode @Nonnull @Override - public String getBlockKind() { - return "stairs"; + public WoodBlockKind getBlockKind() { + return WoodBlockKind.STAIRS; } @Nonnull @Override - public EnumWoodType getWoodType(int meta) { + public T getWoodType(int meta) { return woodType; } @Nonnull @Override - public Collection getWoodTypes() { + public Collection getWoodTypes() { return Collections.singleton(woodType); } - @Override - @SideOnly(Side.CLIENT) - public void registerStateMapper() { - Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, null)); - } - @Override public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return woodType.getHardness(); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java index 78ea38dbd..104e419fa 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockRegistryArboriculture.java @@ -19,9 +19,20 @@ import java.util.Map.Entry; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; + +import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumPileType; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IAlleleFruit; +import forestry.arboriculture.blocks.fence.BlockArbFence; +import forestry.arboriculture.blocks.fence.BlockFireproofVanillaFence; +import forestry.arboriculture.blocks.log.BlockArbLog; +import forestry.arboriculture.blocks.log.BlockFireproofVanillaLog; +import forestry.arboriculture.blocks.planks.BlockArbPlanks; +import forestry.arboriculture.blocks.planks.BlockFireproofVanillaPlanks; +import forestry.arboriculture.blocks.slab.BlockArbSlab; +import forestry.arboriculture.blocks.slab.BlockFireproofVanillaSlab; +import forestry.arboriculture.blocks.slab.BlockForestrySlab; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.items.ItemBlockDecorativeLeaves; @@ -37,18 +48,25 @@ import forestry.core.utils.OreDictUtil; public class BlockRegistryArboriculture extends BlockRegistry { public final List logs; public final List logsFireproof; + public final List logsVanillaFireproof; public final List planks; public final List planksFireproof; + public final List planksVanillaFireproof; public final List slabs; public final List slabsDouble; public final List slabsFireproof; public final List slabsDoubleFireproof; + public final List slabsVanillaFireproof; + public final List slabsVanillaDoubleFireproof; public final List fences; public final List fencesFireproof; - public final List fenceGates; - public final List fenceGatesFireproof; - public final List stairs; - public final List stairsFireproof; + public final List fencesVanillaFireproof; + public final List fenceGates; + public final List fenceGatesFireproof; + public final List fenceGatesVanillaFireproof; + public final List stairs; + public final List stairsFireproof; + public final List stairsVanillaFireproof; public final List doors; public final BlockSapling saplingGE; @@ -74,6 +92,12 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerOreDictWildcard(OreDictUtil.LOG_WOOD, block); } + logsVanillaFireproof = BlockFireproofVanillaLog.create(); + for (BlockFireproofVanillaLog block : logsVanillaFireproof) { + registerBlock(block, new ItemBlockWood(block), "logs.vanilla.fireproof." + block.getBlockNumber()); + registerOreDictWildcard(OreDictUtil.LOG_WOOD, block); + } + planks = BlockArbPlanks.create(false); for (BlockArbPlanks block : planks) { registerBlock(block, new ItemBlockWood(block), "planks." + block.getBlockNumber()); @@ -86,6 +110,12 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerOreDictWildcard(OreDictUtil.PLANK_WOOD, block); } + planksVanillaFireproof = BlockFireproofVanillaPlanks.create(); + for (BlockFireproofVanillaPlanks block : planksVanillaFireproof) { + registerBlock(block, new ItemBlockWood(block), "planks.vanilla.fireproof." + block.getBlockNumber()); + registerOreDictWildcard(OreDictUtil.PLANK_WOOD, block); + } + slabs = BlockArbSlab.create(false, false); slabsDouble = BlockArbSlab.create(false, true); for (int i = 0; i < slabs.size(); i++) { @@ -106,6 +136,16 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerOreDictWildcard(OreDictUtil.SLAB_WOOD, slab); } + slabsVanillaFireproof = BlockFireproofVanillaSlab.create(false); + slabsVanillaDoubleFireproof = BlockFireproofVanillaSlab.create(true); + for (int i = 0; i < slabsVanillaFireproof.size(); i++) { + BlockForestrySlab slab = slabsVanillaFireproof.get(i); + BlockForestrySlab slabDouble = slabsVanillaDoubleFireproof.get(i); + registerBlock(slab, new ItemBlockWoodSlab(slab, slab, slabDouble), "slabs.vanilla.fireproof." + slab.getBlockNumber()); + registerBlock(slabDouble, new ItemBlockWoodSlab(slabDouble, slab, slabDouble), "slabs.vanilla.double.fireproof." + slabDouble.getBlockNumber()); + registerOreDictWildcard(OreDictUtil.SLAB_WOOD, slab); + } + fences = BlockArbFence.create(false); for (BlockArbFence block : fences) { registerBlock(block, new ItemBlockWood(block), "fences." + block.getBlockNumber()); @@ -117,28 +157,42 @@ public class BlockRegistryArboriculture extends BlockRegistry { registerBlock(block, new ItemBlockWood(block), "fences.fireproof." + block.getBlockNumber()); registerOreDictWildcard(OreDictUtil.FENCE_WOOD, block); } + + fencesVanillaFireproof = BlockFireproofVanillaFence.create(); + for (BlockFireproofVanillaFence block : fencesVanillaFireproof) { + registerBlock(block, new ItemBlockWood(block), "fences.vanilla.fireproof." + block.getBlockNumber()); + registerOreDictWildcard(OreDictUtil.FENCE_WOOD, block); + } fenceGates = new ArrayList<>(); fenceGatesFireproof = new ArrayList<>(); - for (EnumWoodType woodType : EnumWoodType.VALUES) { - BlockArbFenceGate fenceGate = new BlockArbFenceGate(false, woodType); + for (EnumForestryWoodType woodType : EnumForestryWoodType.VALUES) { + BlockForestryFenceGate fenceGate = new BlockForestryFenceGate<>(false, woodType); registerBlock(fenceGate, new ItemBlockWood(fenceGate), "fence.gates." + woodType); registerOreDictWildcard(OreDictUtil.FENCE_GATE_WOOD, fenceGate); fenceGates.add(fenceGate); - BlockArbFenceGate fenceGateFireproof = new BlockArbFenceGate(true, woodType); + BlockForestryFenceGate fenceGateFireproof = new BlockForestryFenceGate<>(true, woodType); registerBlock(fenceGateFireproof, new ItemBlockWood(fenceGateFireproof), "fence.gates.fireproof." + woodType); registerOreDictWildcard(OreDictUtil.FENCE_GATE_WOOD, fenceGateFireproof); fenceGatesFireproof.add(fenceGateFireproof); } + fenceGatesVanillaFireproof = new ArrayList<>(); + for (EnumVanillaWoodType woodType : EnumVanillaWoodType.VALUES) { + BlockForestryFenceGate fenceGateFireproof = new BlockForestryFenceGate<>(true, woodType); + registerBlock(fenceGateFireproof, new ItemBlockWood(fenceGateFireproof), "fence.gates.vanilla.fireproof." + woodType); + registerOreDictWildcard(OreDictUtil.FENCE_GATE_WOOD, fenceGateFireproof); + fenceGatesFireproof.add(fenceGateFireproof); + } + stairs = new ArrayList<>(); for (BlockArbPlanks plank : planks) { for (IBlockState blockState : plank.getBlockState().getValidStates()) { int meta = plank.getMetaFromState(blockState); - EnumWoodType woodType = plank.getWoodType(meta); + EnumForestryWoodType woodType = plank.getWoodType(meta); - BlockArbStairs stair = new BlockArbStairs(false, blockState, woodType); + BlockForestryStairs stair = new BlockForestryStairs<>(false, blockState, woodType); registerBlock(stair, new ItemBlockWood(stair), "stairs." + woodType); registerOreDictWildcard(OreDictUtil.STAIR_WOOD, stair); stairs.add(stair); @@ -149,17 +203,30 @@ public class BlockRegistryArboriculture extends BlockRegistry { for (BlockArbPlanks plank : planksFireproof) { for (IBlockState blockState : plank.getBlockState().getValidStates()) { int meta = plank.getMetaFromState(blockState); - EnumWoodType woodType = plank.getWoodType(meta); + EnumForestryWoodType woodType = plank.getWoodType(meta); - BlockArbStairs stair = new BlockArbStairs(true, blockState, woodType); + BlockForestryStairs stair = new BlockForestryStairs<>(true, blockState, woodType); registerBlock(stair, new ItemBlockWood(stair), "stairs.fireproof." + woodType); registerOreDictWildcard(OreDictUtil.STAIR_WOOD, stair); stairsFireproof.add(stair); } } + stairsVanillaFireproof = new ArrayList<>(); + for (BlockFireproofVanillaPlanks plank : planksVanillaFireproof) { + for (IBlockState blockState : plank.getBlockState().getValidStates()) { + int meta = plank.getMetaFromState(blockState); + EnumVanillaWoodType woodType = plank.getWoodType(meta); + + BlockForestryStairs stair = new BlockForestryStairs<>(true, blockState, woodType); + registerBlock(stair, new ItemBlockWood(stair), "stairs.vanilla.fireproof." + woodType); + registerOreDictWildcard(OreDictUtil.STAIR_WOOD, stair); + stairsVanillaFireproof.add(stair); + } + } + doors = new ArrayList<>(); - for (EnumWoodType woodType : EnumWoodType.VALUES) { + for (EnumForestryWoodType woodType : EnumForestryWoodType.VALUES) { BlockArbDoor door = new BlockArbDoor(woodType); registerBlock(door, new ItemBlockWoodDoor(door), "doors." + woodType); registerOreDictWildcard(OreDictUtil.DOOR_WOOD, door); diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypePredicate.java b/src/main/java/forestry/arboriculture/blocks/WoodTypePredicate.java index a9c17d7a3..61faba7d9 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypePredicate.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypePredicate.java @@ -2,9 +2,9 @@ package forestry.arboriculture.blocks; import com.google.common.base.Predicate; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; -public class WoodTypePredicate implements Predicate { +public class WoodTypePredicate implements Predicate { private final int minWoodTypeMeta; private final int maxWoodTypeMeta; @@ -14,7 +14,7 @@ public class WoodTypePredicate implements Predicate { } @Override - public boolean apply(EnumWoodType woodType) { + public boolean apply(IWoodType woodType) { return woodType.getMetadata() >= minWoodTypeMeta && woodType.getMetadata() <= maxWoodTypeMeta; } } diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java index 7b6177adf..0d3fb3114 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java @@ -9,37 +9,42 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockFenceGate; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.blocks.property.PropertyWoodType; +import forestry.core.config.Constants; @SideOnly(Side.CLIENT) -class WoodTypeStateMapper extends StateMapperBase { +public class WoodTypeStateMapper extends StateMapperBase { @Nonnull private final IWoodTyped woodTyped; @Nonnull private final String blockPath; @Nullable - private final PropertyWoodType propertyWoodType; + private final PropertyWoodType propertyWoodType; @Nonnull private final List propertiesToRemove = new ArrayList<>(); - public WoodTypeStateMapper(@Nonnull IWoodTyped woodTyped, @Nullable PropertyWoodType propertyWoodType) { + public WoodTypeStateMapper(@Nonnull IWoodTyped woodTyped, @Nullable PropertyWoodType propertyWoodType) { this.woodTyped = woodTyped; - this.blockPath = woodTyped.getBlockKind(); + this.blockPath = woodTyped.getBlockKind().toString(); this.propertyWoodType = propertyWoodType; } - public WoodTypeStateMapper(@Nonnull IWoodTyped woodTyped, @Nonnull String blockPath, @Nullable PropertyWoodType propertyWoodType) { + public WoodTypeStateMapper(@Nonnull IWoodTyped woodTyped, @Nonnull String blockPath, @Nullable PropertyWoodType propertyWoodType) { this.woodTyped = woodTyped; this.blockPath = blockPath; this.propertyWoodType = propertyWoodType; @@ -59,18 +64,36 @@ class WoodTypeStateMapper extends StateMapperBase { } else { properties = Maps.newLinkedHashMap(state.getProperties()); } - + for (IProperty property : propertiesToRemove) { properties.remove(property); } Block block = state.getBlock(); int meta = block.getMetaFromState(state); - EnumWoodType woodType = woodTyped.getWoodType(meta); - String resourceDomain = Block.REGISTRY.getNameForObject(block).getResourceDomain(); + IWoodType woodType = woodTyped.getWoodType(meta); + if (woodType instanceof EnumForestryWoodType) { + return getForestryModelResourceLocation(woodType, properties); + } else { + return getVanillaModelResourceLocation(block, woodType, properties); + } + } + + private ModelResourceLocation getForestryModelResourceLocation(IWoodType woodType, Map, Comparable> properties) { String resourceLocation = "arboriculture/" + blockPath + '/' + woodType; String propertyString = this.getPropertyString(properties); - return new ModelResourceLocation(resourceDomain + ':' + resourceLocation, propertyString); + return new ModelResourceLocation(Constants.RESOURCE_ID + ':' + resourceLocation, propertyString); + } + + private ModelResourceLocation getVanillaModelResourceLocation(Block block, IWoodType woodType, Map, Comparable> properties) { + String resourceLocation; + if (woodType == EnumVanillaWoodType.OAK && (block instanceof BlockFenceGate || block instanceof BlockFence)) { + resourceLocation = blockPath; + } else { + resourceLocation = woodType + "_" + blockPath; + } + String propertyString = this.getPropertyString(properties); + return new ModelResourceLocation("minecraft:" + resourceLocation, propertyString); } } diff --git a/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java new file mode 100644 index 000000000..d570773fd --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockArbFence.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.fence; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.blocks.property.PropertyForestryWoodType; + +public abstract class BlockArbFence extends BlockForestryFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + public static List create(boolean fireproof) { + List blocks = new ArrayList<>(); + + PropertyForestryWoodType[] variants = PropertyForestryWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyForestryWoodType variant = variants[i]; + BlockArbFence block = new BlockArbFence(fireproof, i) { + @Nonnull + @Override + public PropertyForestryWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockArbFence(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + } + + @Nonnull + @Override + public EnumForestryWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumForestryWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/fence/BlockFireproofVanillaFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockFireproofVanillaFence.java new file mode 100644 index 000000000..9e346de8d --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockFireproofVanillaFence.java @@ -0,0 +1,39 @@ +package forestry.arboriculture.blocks.fence; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.arboriculture.blocks.property.PropertyVanillaWoodType; + +public abstract class BlockFireproofVanillaFence extends BlockForestryFence { + public static List create() { + List blocks = new ArrayList<>(); + + PropertyVanillaWoodType[] variants = PropertyVanillaWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyVanillaWoodType variant = variants[i]; + BlockFireproofVanillaFence block = new BlockFireproofVanillaFence(i) { + @Nonnull + @Override + public PropertyVanillaWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockFireproofVanillaFence(int blockNumber) { + super(true, blockNumber); + } + + @Nonnull + @Override + public EnumVanillaWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumVanillaWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java similarity index 65% rename from src/main/java/forestry/arboriculture/blocks/BlockArbFence.java rename to src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java index f29a791a4..41f08ada3 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java @@ -1,17 +1,6 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.blocks; +package forestry.arboriculture.blocks.fence; import javax.annotation.Nonnull; -import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -36,8 +25,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; @@ -45,40 +35,24 @@ import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.WoodHelper.WoodMeshDefinition; +import forestry.arboriculture.blocks.MaterialArbWood; +import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; -public abstract class BlockArbFence extends BlockFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { - private static final int VARIANTS_PER_BLOCK = 16; - private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; - - public static List create(boolean fireproof) { - List blocks = new ArrayList<>(); - final int blockCount = PropertyWoodType.getBlockCount(VARIANTS_PER_BLOCK); - for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { - final PropertyWoodType variant = PropertyWoodType.create("variant", blockNumber, VARIANTS_PER_BLOCK); - BlockArbFence block = new BlockArbFence(fireproof, blockNumber) { - @Nonnull - @Override - public PropertyWoodType getVariant() { - return variant; - } - }; - blocks.add(block); - } - return blocks; - } +public abstract class BlockForestryFence & IWoodType> extends BlockFence implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + protected static final int VARIANTS_PER_BLOCK = 16; + protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; - public BlockArbFence(boolean fireproof, int blockNumber) { + protected BlockForestryFence(boolean fireproof, int blockNumber) { super(MaterialArbWood.ARB_WOOD, BlockPlanks.EnumType.OAK.getMapColor()); this.fireproof = fireproof; this.blockNumber = blockNumber; - PropertyWoodType variant = getVariant(); + PropertyWoodType variant = getVariant(); this.setDefaultState(this.blockState.getBaseState() .withProperty(NORTH, false) .withProperty(EAST, false) @@ -95,7 +69,7 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II } @Nonnull - public abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); @Override public boolean isFireproof() { @@ -131,13 +105,13 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II @Override public void registerModel(Item item, IModelManager manager) { manager.registerVariant(item, WoodHelper.getResourceLocations(this)); - manager.registerItemModel(item, new WoodMeshDefinition(this)); + manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } @Override public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return woodType.getHardness(); } @@ -159,8 +133,8 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II @Nonnull @Override - public String getBlockKind() { - return "fences"; + public WoodBlockKind getBlockKind() { + return WoodBlockKind.FENCE; } @Override @@ -170,20 +144,17 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II @Override public IBlockState getStateFromMeta(int meta) { - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return getDefaultState().withProperty(getVariant(), woodType); } @Nonnull @Override - public EnumWoodType getWoodType(int meta) { - int variantMeta = (meta & VARIANTS_META_MASK) + blockNumber * VARIANTS_PER_BLOCK; - return EnumWoodType.byMetadata(variantMeta); - } + public abstract T getWoodType(int meta); @Nonnull @Override - public Collection getWoodTypes() { + public Collection getWoodTypes() { return getVariant().getAllowedValues(); } @@ -199,14 +170,14 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II @Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return getDefaultState().withProperty(getVariant(), woodType); } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (EnumWoodType woodType : getVariant().getAllowedValues()) { - list.add(TreeManager.woodAccess.getFence(woodType, fireproof)); + for (T woodType : getVariant().getAllowedValues()) { + list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } } diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java new file mode 100644 index 000000000..e42cbca2b --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockArbLog.java @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.log; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.arboriculture.blocks.property.PropertyForestryWoodType; + +public abstract class BlockArbLog extends BlockForestryLog { + public static List create(boolean fireproof) { + List blocks = new ArrayList<>(); + PropertyForestryWoodType[] variants = PropertyForestryWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyForestryWoodType variant = variants[i]; + BlockArbLog block = new BlockArbLog(fireproof, i) { + @Nonnull + @Override + public PropertyForestryWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockArbLog(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + } + + @Nonnull + @Override + public EnumForestryWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumForestryWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java new file mode 100644 index 000000000..8e6b2b522 --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockFireproofVanillaLog.java @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.log; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.arboriculture.blocks.property.PropertyVanillaWoodType; + +public abstract class BlockFireproofVanillaLog extends BlockForestryLog { + public static List create() { + List blocks = new ArrayList<>(); + PropertyVanillaWoodType[] variants = PropertyVanillaWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyVanillaWoodType variant = variants[i]; + BlockFireproofVanillaLog block = new BlockFireproofVanillaLog(i) { + @Nonnull + @Override + public PropertyVanillaWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockFireproofVanillaLog(int blockNumber) { + super(true, blockNumber); + } + + @Nonnull + @Override + public EnumVanillaWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumVanillaWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java similarity index 52% rename from src/main/java/forestry/arboriculture/blocks/BlockArbLog.java rename to src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java index 7af165aef..b7cd77e62 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbLog.java +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java @@ -1,17 +1,6 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.blocks; +package forestry.arboriculture.blocks.log; import javax.annotation.Nonnull; -import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -31,46 +20,32 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; +import forestry.arboriculture.blocks.MaterialArbWood; +import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; -public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IStateMapperRegister, IItemModelRegister { - private static final int VARIANTS_PER_BLOCK = 4; - private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; - - public static List create(boolean fireproof) { - List logs = new ArrayList<>(); - final int blockCount = PropertyWoodType.getBlockCount(VARIANTS_PER_BLOCK); - for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { - final PropertyWoodType variant = PropertyWoodType.create("variant", blockNumber, VARIANTS_PER_BLOCK); - BlockArbLog log = new BlockArbLog(fireproof, blockNumber) { - @Nonnull - @Override - public PropertyWoodType getVariant() { - return variant; - } - }; - logs.add(log); - } - return logs; - } +public abstract class BlockForestryLog & IWoodType> extends BlockLog implements IWoodTyped, IStateMapperRegister, IItemModelRegister { + protected static final int VARIANTS_PER_BLOCK = 4; + protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; - private BlockArbLog(boolean fireproof, int blockNumber) { + protected BlockForestryLog(boolean fireproof, int blockNumber) { this.fireproof = fireproof; this.blockNumber = blockNumber; - PropertyWoodType variant = getVariant(); + PropertyWoodType variant = getVariant(); setDefaultState(this.blockState.getBaseState().withProperty(variant, variant.getFirstType()).withProperty(LOG_AXIS, EnumAxis.Y)); setHarvestLevel("axe", 0); @@ -79,47 +54,24 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState @Nonnull @Override - public String getBlockKind() { - return "log"; + public final WoodBlockKind getBlockKind() { + return WoodBlockKind.LOG; } @Override - public boolean isFireproof() { + public final boolean isFireproof() { return fireproof; } - @Nonnull - public abstract PropertyWoodType getVariant(); - - public int getBlockNumber() { + public final int getBlockNumber() { return blockNumber; } - + @Override - public Material getMaterial(IBlockState state) { + public final Material getMaterial(IBlockState state) { return MaterialArbWood.ARB_WOOD; } - @Override - public IBlockState getStateFromMeta(int meta) { - EnumWoodType woodType = getWoodType(meta); - EnumAxis axis = getAxis(meta); - return getDefaultState().withProperty(getVariant(), woodType).withProperty(LOG_AXIS, axis); - } - - @Nonnull - @Override - public EnumWoodType getWoodType(int meta) { - int variantMeta = (meta & VARIANTS_META_MASK) + blockNumber * VARIANTS_PER_BLOCK; - return EnumWoodType.byMetadata(variantMeta); - } - - @Nonnull - @Override - public Collection getWoodTypes() { - return getVariant().getAllowedValues(); - } - private static EnumAxis getAxis(int meta) { switch (meta & 12) { case 0: @@ -133,9 +85,16 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState } } + @Override + public final IBlockState getStateFromMeta(int meta) { + T woodType = getWoodType(meta); + EnumAxis axis = getAxis(meta); + return getDefaultState().withProperty(getVariant(), woodType).withProperty(LOG_AXIS, axis); + } + @SuppressWarnings("incomplete-switch") @Override - public int getMetaFromState(IBlockState state) { + public final int getMetaFromState(IBlockState state) { int i = damageDropped(state); switch (state.getValue(LOG_AXIS)) { @@ -152,54 +111,60 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState return i; } + @Nonnull + public abstract PropertyWoodType getVariant(); + + @Nonnull @Override - protected BlockStateContainer createBlockState() { + public abstract T getWoodType(int meta); + + @Nonnull + @Override + public final Collection getWoodTypes() { + return getVariant().getAllowedValues(); + } + + @Override + protected final BlockStateContainer createBlockState() { return new BlockStateContainer(this, getVariant(), LOG_AXIS); } @Override - protected ItemStack createStackedBlock(IBlockState state) { + protected final ItemStack createStackedBlock(IBlockState state) { int meta = damageDropped(state); Item item = Item.getItemFromBlock(this); return new ItemStack(item, 1, meta); } @Override - public int damageDropped(IBlockState state) { + public final int damageDropped(IBlockState state) { return state.getValue(getVariant()).getMetadata() - blockNumber * VARIANTS_PER_BLOCK; } - + @Override - public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { + public final IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { EnumAxis axis = EnumAxis.fromFacingAxis(facing.getAxis()); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return getDefaultState().withProperty(getVariant(), woodType).withProperty(LOG_AXIS, axis); } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (EnumWoodType woodType : getVariant().getAllowedValues()) { - list.add(TreeManager.woodAccess.getLog(woodType, fireproof)); + public final void getSubBlocks(Item item, CreativeTabs tab, List list) { + for (T woodType : getVariant().getAllowedValues()) { + list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } } - @SideOnly(Side.CLIENT) @Override - public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); - manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); - } - - @Override - public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { + public final float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return woodType.getHardness(); } /* PROPERTIES */ @Override - public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { + public final int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { if (fireproof) { return 0; } else if (face == EnumFacing.DOWN) { @@ -212,17 +177,23 @@ public abstract class BlockArbLog extends BlockLog implements IWoodTyped, IState } @Override - public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { + public final int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { if (fireproof) { return 0; } return 5; } - @Override @SideOnly(Side.CLIENT) - public void registerStateMapper() { - Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, getVariant())); + @Override + public final void registerModel(Item item, IModelManager manager) { + manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } + @Override + @SideOnly(Side.CLIENT) + public final void registerStateMapper() { + Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, getVariant())); + } } diff --git a/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java new file mode 100644 index 000000000..ce53017fc --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockArbPlanks.java @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.planks; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.arboriculture.blocks.property.PropertyForestryWoodType; + +public abstract class BlockArbPlanks extends BlockForestryPlanks { + public static List create(boolean fireproof) { + List blocks = new ArrayList<>(); + PropertyForestryWoodType[] variants = PropertyForestryWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyForestryWoodType variant = variants[i]; + BlockArbPlanks block = new BlockArbPlanks(fireproof, i) { + @Nonnull + @Override + public PropertyForestryWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockArbPlanks(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + } + + @Nonnull + @Override + public EnumForestryWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumForestryWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/planks/BlockFireproofVanillaPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockFireproofVanillaPlanks.java new file mode 100644 index 000000000..0bcfc5ae7 --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockFireproofVanillaPlanks.java @@ -0,0 +1,38 @@ +package forestry.arboriculture.blocks.planks; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.arboriculture.blocks.property.PropertyVanillaWoodType; + +public abstract class BlockFireproofVanillaPlanks extends BlockForestryPlanks { + public static List create() { + List blocks = new ArrayList<>(); + PropertyVanillaWoodType[] variants = PropertyVanillaWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyVanillaWoodType variant = variants[i]; + BlockFireproofVanillaPlanks block = new BlockFireproofVanillaPlanks(i) { + @Nonnull + @Override + public PropertyVanillaWoodType getVariant() { + return variant; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockFireproofVanillaPlanks(int blockNumber) { + super(true, blockNumber); + } + + @Nonnull + @Override + public EnumVanillaWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumVanillaWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java similarity index 59% rename from src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java rename to src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java index a8c9fc65a..edfdf315f 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java @@ -1,22 +1,10 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.blocks; +package forestry.arboriculture.blocks.planks; import javax.annotation.Nonnull; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -31,47 +19,33 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; +import forestry.arboriculture.blocks.MaterialArbWood; +import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; -public abstract class BlockArbPlanks extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { - private static final int VARIANTS_PER_BLOCK = 16; - private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; - - public static List create(boolean fireproof) { - List planks = new ArrayList<>(); - final int blockCount = PropertyWoodType.getBlockCount(VARIANTS_PER_BLOCK); - for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { - final PropertyWoodType variant = PropertyWoodType.create("variant", blockNumber, VARIANTS_PER_BLOCK); - BlockArbPlanks block = new BlockArbPlanks(fireproof, blockNumber) { - @Nonnull - @Override - public PropertyWoodType getVariant() { - return variant; - } - }; - planks.add(block); - } - return planks; - } +public abstract class BlockForestryPlanks & IWoodType> extends Block implements IWoodTyped, IStateMapperRegister, IItemModelRegister { + protected static final int VARIANTS_PER_BLOCK = 16; + protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; - private BlockArbPlanks(boolean fireproof, int blockNumber) { + protected BlockForestryPlanks(boolean fireproof, int blockNumber) { super(MaterialArbWood.ARB_WOOD); this.fireproof = fireproof; this.blockNumber = blockNumber; - PropertyWoodType variant = getVariant(); + PropertyWoodType variant = getVariant(); setDefaultState(this.blockState.getBaseState().withProperty(variant, variant.getFirstType())); setResistance(5.0F); @@ -85,7 +59,11 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState } @Nonnull - public abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); + + @Nonnull + @Override + public abstract T getWoodType(int meta); public int getBlockNumber() { return blockNumber; @@ -93,26 +71,19 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState @Nonnull @Override - public String getBlockKind() { - return "planks"; + public WoodBlockKind getBlockKind() { + return WoodBlockKind.PLANKS; } @Override public IBlockState getStateFromMeta(int meta) { - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return getDefaultState().withProperty(getVariant(), woodType); } @Nonnull @Override - public EnumWoodType getWoodType(int meta) { - int variantMeta = (meta & VARIANTS_META_MASK) + blockNumber * VARIANTS_PER_BLOCK; - return EnumWoodType.byMetadata(variantMeta); - } - - @Nonnull - @Override - public Collection getWoodTypes() { + public Collection getWoodTypes() { return getVariant().getAllowedValues(); } @@ -133,23 +104,17 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState @Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return getDefaultState().withProperty(getVariant(), woodType); } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for (EnumWoodType woodType : getVariant().getAllowedValues()) { - list.add(TreeManager.woodAccess.getPlanks(woodType, fireproof)); + for (T woodType : getVariant().getAllowedValues()) { + list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } } - @Override - @SideOnly(Side.CLIENT) - public void registerStateMapper() { - Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, getVariant())); - } - @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { @@ -157,10 +122,16 @@ public abstract class BlockArbPlanks extends Block implements IWoodTyped, IState manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } + @Override + @SideOnly(Side.CLIENT) + public final void registerStateMapper() { + Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, getVariant())); + } + @Override public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return woodType.getHardness(); } diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyForestryWoodType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyForestryWoodType.java new file mode 100644 index 000000000..05134d1d9 --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyForestryWoodType.java @@ -0,0 +1,27 @@ +package forestry.arboriculture.blocks.property; + +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; + +import javax.annotation.Nonnull; +import java.util.Collection; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.arboriculture.blocks.WoodTypePredicate; + +public class PropertyForestryWoodType extends PropertyWoodType { + public static PropertyForestryWoodType[] create(@Nonnull String name, int variantsPerBlock) { + final int variantCount = (int) Math.ceil((float) EnumForestryWoodType.VALUES.length / variantsPerBlock); + PropertyForestryWoodType[] variants = new PropertyForestryWoodType[variantCount]; + for (int variantNumber = 0; variantNumber < variantCount; variantNumber++) { + WoodTypePredicate filter = new WoodTypePredicate(variantNumber, variantsPerBlock); + Collection allowedValues = Collections2.filter(Lists.newArrayList(EnumForestryWoodType.class.getEnumConstants()), filter); + variants[variantNumber] = new PropertyForestryWoodType(name, EnumForestryWoodType.class, allowedValues); + } + return variants; + } + + protected PropertyForestryWoodType(String name, Class valueClass, Collection allowedValues) { + super(name, valueClass, allowedValues); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java index 6896e1100..3162d0c96 100644 --- a/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java @@ -11,6 +11,7 @@ package forestry.arboriculture.blocks.property; import com.google.common.base.Objects; + import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -19,6 +20,7 @@ import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.core.blocks.propertys.PropertyAllele; +import forestry.core.config.Constants; public class PropertyTree extends PropertyAllele { @@ -54,7 +56,7 @@ public class PropertyTree extends PropertyAllele { @Override public String getName(IAlleleTreeSpecies value) { - return value.getModelName().replace("tree", "").toLowerCase(Locale.ENGLISH); + return value.getUID().replace(Constants.MOD_ID + ".tree", "").toLowerCase(Locale.ENGLISH); } } diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyVanillaWoodType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyVanillaWoodType.java new file mode 100644 index 000000000..324733cbc --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyVanillaWoodType.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.property; + +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; + +import javax.annotation.Nonnull; +import java.util.Collection; + +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.arboriculture.blocks.WoodTypePredicate; + +public class PropertyVanillaWoodType extends PropertyWoodType { + + public static PropertyVanillaWoodType[] create(@Nonnull String name, int variantsPerBlock) { + final int variantCount = (int) Math.ceil((float) EnumVanillaWoodType.VALUES.length / variantsPerBlock); + PropertyVanillaWoodType[] variants = new PropertyVanillaWoodType[variantCount]; + for (int variantNumber = 0; variantNumber < variantCount; variantNumber++) { + WoodTypePredicate filter = new WoodTypePredicate(variantNumber, variantsPerBlock); + Collection allowedValues = Collections2.filter(Lists.newArrayList(EnumVanillaWoodType.class.getEnumConstants()), filter); + variants[variantNumber] = new PropertyVanillaWoodType(name, EnumVanillaWoodType.class, allowedValues); + } + return variants; + } + + protected PropertyVanillaWoodType(String name, Class valueClass, Collection allowedValues) { + super(name, valueClass, allowedValues); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java index 59822ecd8..4f486b8cf 100644 --- a/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java @@ -10,39 +10,25 @@ ******************************************************************************/ package forestry.arboriculture.blocks.property; -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; - import javax.annotation.Nonnull; import java.util.Collection; import net.minecraft.block.properties.PropertyEnum; -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.blocks.WoodTypePredicate; +import forestry.api.arboriculture.IWoodType; -public class PropertyWoodType extends PropertyEnum { - public static int getBlockCount(int variantsPerBlock) { - return (int) Math.ceil((float) EnumWoodType.VALUES.length / variantsPerBlock); - } - - public static PropertyWoodType create(@Nonnull String name, int blockNumber, int variantsPerBlock) { - WoodTypePredicate filter = new WoodTypePredicate(blockNumber, variantsPerBlock); - Collection allowedValues = Collections2.filter(Lists.newArrayList(EnumWoodType.class.getEnumConstants()), filter); - return new PropertyWoodType(name, EnumWoodType.class, allowedValues); - } - - protected PropertyWoodType(String name, Class valueClass, Collection allowedValues) { +public abstract class PropertyWoodType & IWoodType> extends PropertyEnum { + protected PropertyWoodType(String name, Class valueClass, Collection allowedValues) { super(name, valueClass, allowedValues); } @Nonnull - public EnumWoodType getFirstType() { + public T getFirstType() { return getAllowedValues().iterator().next(); } @Override - public Collection getAllowedValues() { + public Collection getAllowedValues() { return super.getAllowedValues(); } } diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java new file mode 100644 index 000000000..c8e0cc0e2 --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockArbSlab.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.slab; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.blocks.property.PropertyForestryWoodType; + +public abstract class BlockArbSlab extends BlockForestrySlab implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + public static List create(boolean fireproof, final boolean doubleSlab) { + List blocks = new ArrayList<>(); + PropertyForestryWoodType[] variants = PropertyForestryWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyForestryWoodType variant = variants[i]; + BlockArbSlab block = new BlockArbSlab(fireproof, i) { + @Nonnull + @Override + public PropertyForestryWoodType getVariant() { + return variant; + } + + @Override + public boolean isDouble() { + return doubleSlab; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockArbSlab(boolean fireproof, int blockNumber) { + super(fireproof, blockNumber); + } + + @Nonnull + @Override + public EnumForestryWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumForestryWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockFireproofVanillaSlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockFireproofVanillaSlab.java new file mode 100644 index 000000000..d9b219c7a --- /dev/null +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockFireproofVanillaSlab.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.blocks.slab; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IStateMapperRegister; +import forestry.arboriculture.IWoodTyped; +import forestry.arboriculture.blocks.property.PropertyVanillaWoodType; + +public abstract class BlockFireproofVanillaSlab extends BlockForestrySlab implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + public static List create(final boolean doubleSlab) { + List blocks = new ArrayList<>(); + PropertyVanillaWoodType[] variants = PropertyVanillaWoodType.create("variant", VARIANTS_PER_BLOCK); + for (int i = 0; i < variants.length; i++) { + PropertyVanillaWoodType variant = variants[i]; + BlockFireproofVanillaSlab block = new BlockFireproofVanillaSlab(i) { + @Nonnull + @Override + public PropertyVanillaWoodType getVariant() { + return variant; + } + + @Override + public boolean isDouble() { + return doubleSlab; + } + }; + blocks.add(block); + } + return blocks; + } + + private BlockFireproofVanillaSlab(int blockNumber) { + super(true, blockNumber); + } + + @Nonnull + @Override + public EnumVanillaWoodType getWoodType(int meta) { + int variantMeta = (meta & VARIANTS_META_MASK) + getBlockNumber() * VARIANTS_PER_BLOCK; + return EnumVanillaWoodType.byMetadata(variantMeta); + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java similarity index 60% rename from src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java rename to src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java index 5aa8b4ac7..193f32abc 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java @@ -1,24 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.arboriculture.blocks; +package forestry.arboriculture.blocks.slab; import javax.annotation.Nonnull; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Random; import net.minecraft.block.BlockSlab; import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -33,48 +21,28 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.IStateMapperRegister; import forestry.api.core.Tabs; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.WoodHelper.WoodMeshDefinition; +import forestry.arboriculture.blocks.MaterialArbWood; +import forestry.arboriculture.blocks.WoodTypeStateMapper; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.core.proxy.Proxies; -public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IItemModelRegister, IStateMapperRegister { - private static final int VARIANTS_PER_BLOCK = 8; - private static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; - - public static List create(boolean fireproof, final boolean doubleSlab) { - List blocks = new ArrayList<>(); - final int blockCount = PropertyWoodType.getBlockCount(VARIANTS_PER_BLOCK); - for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { - final PropertyWoodType variant = PropertyWoodType.create("variant", blockNumber, VARIANTS_PER_BLOCK); - BlockArbSlab block = new BlockArbSlab(fireproof, blockNumber) { - @Nonnull - @Override - public PropertyWoodType getVariant() { - return variant; - } - - @Override - public boolean isDouble() { - return doubleSlab; - } - }; - blocks.add(block); - } - return blocks; - } +public abstract class BlockForestrySlab & IWoodType> extends BlockSlab implements IWoodTyped, IItemModelRegister, IStateMapperRegister { + protected static final int VARIANTS_PER_BLOCK = 8; + protected static final int VARIANTS_META_MASK = VARIANTS_PER_BLOCK - 1; private final boolean fireproof; private final int blockNumber; - private BlockArbSlab(boolean fireproof, int blockNumber) { + protected BlockForestrySlab(boolean fireproof, int blockNumber) { super(MaterialArbWood.ARB_WOOD); this.fireproof = fireproof; this.blockNumber = blockNumber; @@ -85,7 +53,7 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte iblockstate = iblockstate.withProperty(HALF, EnumBlockHalf.BOTTOM); } - PropertyWoodType variant = getVariant(); + PropertyWoodType variant = getVariant(); setDefaultState(iblockstate.withProperty(variant, variant.getFirstType())); setCreativeTab(Tabs.tabArboriculture); @@ -102,7 +70,7 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte } @Nonnull - public abstract PropertyWoodType getVariant(); + public abstract PropertyWoodType getVariant(); public int getBlockNumber() { return blockNumber; @@ -112,10 +80,10 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte protected BlockStateContainer createBlockState() { return this.isDouble() ? new BlockStateContainer(this, getVariant()) : new BlockStateContainer(this, HALF, getVariant()); } - + @Override public IBlockState getStateFromMeta(int meta) { - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); IBlockState iblockstate = this.getDefaultState().withProperty(getVariant(), woodType); if (!this.isDouble()) { @@ -127,14 +95,11 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte @Nonnull @Override - public EnumWoodType getWoodType(int meta) { - int variantMeta = (meta & VARIANTS_META_MASK) + blockNumber * VARIANTS_PER_BLOCK; - return EnumWoodType.byMetadata(variantMeta); - } + public abstract T getWoodType(int meta); @Override public int getMetaFromState(IBlockState state) { - EnumWoodType woodType = state.getValue(getVariant()); + T woodType = state.getValue(getVariant()); int meta = woodType.getMetadata() - blockNumber * VARIANTS_PER_BLOCK; if (!this.isDouble() && state.getValue(HALF) == BlockSlab.EnumBlockHalf.TOP) { @@ -151,37 +116,37 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - EnumWoodType woodType = state.getValue(getVariant()); - ItemStack slab = TreeManager.woodAccess.getSlab(woodType, isFireproof()); + T woodType = state.getValue(getVariant()); + ItemStack slab = TreeManager.woodAccess.getStack(woodType, getBlockKind(), isFireproof()); return slab.getItem(); } @SuppressWarnings("deprecation") // this is the way the vanilla slabs work @Override public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - EnumWoodType woodType = state.getValue(getVariant()); - ItemStack slab = TreeManager.woodAccess.getSlab(woodType, isFireproof()); + T woodType = state.getValue(getVariant()); + ItemStack slab = TreeManager.woodAccess.getStack(woodType, getBlockKind(), isFireproof()); return new ItemStack(slab.getItem(), 1, getMetaFromState(state)); } - + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { manager.registerVariant(item, WoodHelper.getResourceLocations(this)); - manager.registerItemModel(item, new WoodMeshDefinition(this)); + manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } @Override public String getUnlocalizedName(int meta) { - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return WoodHelper.getDisplayName(this, woodType); } @Override public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { if (!isDouble()) { - for (EnumWoodType woodType : getVariant().getAllowedValues()) { - list.add(TreeManager.woodAccess.getSlab(woodType, fireproof)); + for (T woodType : getVariant().getAllowedValues()) { + list.add(TreeManager.woodAccess.getStack(woodType, getBlockKind(), fireproof)); } } } @@ -189,7 +154,7 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte @Override public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) { int meta = getMetaFromState(blockState); - EnumWoodType woodType = getWoodType(meta); + T woodType = getWoodType(meta); return woodType.getHardness(); } @@ -205,8 +170,8 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte @Nonnull @Override - public String getBlockKind() { - return "slab"; + public WoodBlockKind getBlockKind() { + return WoodBlockKind.SLAB; } @Override @@ -221,14 +186,14 @@ public abstract class BlockArbSlab extends BlockSlab implements IWoodTyped, IIte @Nonnull @Override - public Collection getWoodTypes() { + public Collection getWoodTypes() { return getVariant().getAllowedValues(); } @Override @SideOnly(Side.CLIENT) public void registerStateMapper() { - String blockPath = isDouble() ? "slab/double" : "slab"; + String blockPath = isDouble() ? "double_slab" : getBlockKind().toString(); Proxies.render.registerStateMapper(this, new WoodTypeStateMapper(this, blockPath, getVariant())); } } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index c0ecbc7d7..bd0c41d8f 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -16,11 +16,7 @@ import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.block.BlockLog; -import net.minecraft.block.BlockNewLog; -import net.minecraft.block.BlockOldLog; -import net.minecraft.block.BlockPlanks; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; @@ -30,11 +26,12 @@ import net.minecraft.world.gen.feature.WorldGenerator; import com.mojang.authlib.GameProfile; +import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumFruitFamily; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumLeafType; import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; import forestry.api.arboriculture.IGermlingModelProvider; @@ -44,7 +41,9 @@ import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeGenome; import forestry.api.arboriculture.ITreeMutationCustom; import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; @@ -52,8 +51,7 @@ import forestry.api.world.ITreeGenData; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; -import forestry.arboriculture.models.ModelProviderGermling; -import forestry.arboriculture.models.ModelProviderGermlingVanilla; +import forestry.arboriculture.models.ModelProviderFactory; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.worldgen.WorldGenAcacia; import forestry.arboriculture.worldgen.WorldGenAcaciaVanilla; @@ -98,7 +96,7 @@ import forestry.core.genetics.alleles.EnumAllele; import forestry.core.tiles.TileUtil; public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSerializable { - Oak(TreeBranchDefinition.QUERCUS, "appleOak", "robur", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), 0, Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.OAK)) { + Oak(TreeBranchDefinition.QUERCUS, "appleOak", "robur", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), EnumVanillaWoodType.OAK) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenOak(tree); @@ -123,7 +121,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // vanilla } }, - DarkOak(TreeBranchDefinition.QUERCUS, "darkOak", "velutina", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), 5, Blocks.LOG2.getDefaultState().withProperty(BlockNewLog.VARIANT, BlockPlanks.EnumType.DARK_OAK)) { + DarkOak(TreeBranchDefinition.QUERCUS, "darkOak", "velutina", false, EnumLeafType.DECIDUOUS, new Color(4764952), new Color(4764952).brighter(), EnumVanillaWoodType.DARK_OAK) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenDarkOak(tree); @@ -148,7 +146,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // vanilla } }, - Birch(TreeBranchDefinition.BETULA, "silverBirch", "pendula", false, EnumLeafType.DECIDUOUS, new Color(8431445), new Color(0xb0c648), 2, Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.BIRCH)) { + Birch(TreeBranchDefinition.BETULA, "silverBirch", "pendula", false, EnumLeafType.DECIDUOUS, new Color(8431445), new Color(0xb0c648), EnumVanillaWoodType.BIRCH) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBirch(tree); @@ -171,7 +169,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // vanilla } }, - Lime(TreeBranchDefinition.TILIA, "silverLime", "pendula", true, EnumLeafType.DECIDUOUS, new Color(0x5ea107), new Color(0x5ea107).brighter(), EnumWoodType.LIME) { + Lime(TreeBranchDefinition.TILIA, "silverLime", "pendula", true, EnumLeafType.DECIDUOUS, new Color(0x5ea107), new Color(0x5ea107).brighter(), EnumForestryWoodType.LIME) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenSilverLime(tree); @@ -198,7 +196,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Birch, Oak, 15); } }, - Walnut(TreeBranchDefinition.JUGLANS, "commonWalnut", "regia", true, EnumLeafType.DECIDUOUS, new Color(0x798c55), new Color(0xb0c648), EnumWoodType.WALNUT) { + Walnut(TreeBranchDefinition.JUGLANS, "commonWalnut", "regia", true, EnumLeafType.DECIDUOUS, new Color(0x798c55), new Color(0xb0c648), EnumForestryWoodType.WALNUT) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenWalnut(tree); @@ -227,7 +225,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Lime, Cherry, 10); } }, - Chestnut(TreeBranchDefinition.CASTANEA, "sweetChestnut", "sativa", true, EnumLeafType.DECIDUOUS, new Color(0x5ea107), new Color(0xb0c648), EnumWoodType.CHESTNUT) { + Chestnut(TreeBranchDefinition.CASTANEA, "sweetChestnut", "sativa", true, EnumLeafType.DECIDUOUS, new Color(0x5ea107), new Color(0xb0c648), EnumForestryWoodType.CHESTNUT) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenChestnut(tree); @@ -256,7 +254,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Walnut, Cherry, 10); } }, - Cherry(TreeBranchDefinition.PRUNUS, "hillCherry", "serrulata", true, EnumLeafType.DECIDUOUS, new Color(0xe691da), new Color(0xe63e59), EnumWoodType.CHERRY) { + Cherry(TreeBranchDefinition.PRUNUS, "hillCherry", "serrulata", true, EnumLeafType.DECIDUOUS, new Color(0xe691da), new Color(0xe63e59), EnumForestryWoodType.CHERRY) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenCherry(tree); @@ -283,7 +281,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Lime, Birch, 10); } }, - Lemon(TreeBranchDefinition.CITRUS, "lemon", "limon", true, EnumLeafType.DECIDUOUS, new Color(0x88af54), new Color(0xa3b850), EnumWoodType.CITRUS) { + Lemon(TreeBranchDefinition.CITRUS, "lemon", "limon", true, EnumLeafType.DECIDUOUS, new Color(0x88af54), new Color(0xa3b850), EnumForestryWoodType.CITRUS) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); @@ -308,7 +306,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Lime, Cherry, 5); } }, - Plum(TreeBranchDefinition.PRUNUS, "plum", "domestica", true, EnumLeafType.DECIDUOUS, new Color(0x589246), new Color(0xa3b850), EnumWoodType.PLUM) { + Plum(TreeBranchDefinition.PRUNUS, "plum", "domestica", true, EnumLeafType.DECIDUOUS, new Color(0x589246), new Color(0xa3b850), EnumForestryWoodType.PLUM) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); @@ -333,7 +331,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Lemon, Cherry, 5); } }, - Maple(TreeBranchDefinition.ACER, "sugarMaple", "saccharum", true, EnumLeafType.MAPLE, new Color(0xd4f425), new Color(0x619a3c), EnumWoodType.MAPLE) { + Maple(TreeBranchDefinition.ACER, "sugarMaple", "saccharum", true, EnumLeafType.MAPLE, new Color(0xd4f425), new Color(0x619a3c), EnumForestryWoodType.MAPLE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenMaple(tree); @@ -358,7 +356,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Spruce, Larch, 5); } }, - Spruce(TreeBranchDefinition.PICEA, "redSpruce", "abies", false, EnumLeafType.CONIFERS, new Color(6396257), new Color(0x539d12), 1, Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.SPRUCE)) { + Spruce(TreeBranchDefinition.PICEA, "redSpruce", "abies", false, EnumLeafType.CONIFERS, new Color(6396257), new Color(0x539d12), EnumVanillaWoodType.SPRUCE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenSpruce(tree); @@ -382,7 +380,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // vanilla } }, - Larch(TreeBranchDefinition.LARIX, "mundaneLarch", "decidua", true, EnumLeafType.CONIFERS, new Color(0x698f90), new Color(0x569896), EnumWoodType.LARCH) { + Larch(TreeBranchDefinition.LARIX, "mundaneLarch", "decidua", true, EnumLeafType.CONIFERS, new Color(0x698f90), new Color(0x569896), EnumForestryWoodType.LARCH) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLarch(tree); @@ -407,7 +405,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Spruce, Oak, 10); } }, - Pine(TreeBranchDefinition.PINUS, "bullPine", "sabiniana", true, EnumLeafType.CONIFERS, new Color(0xfeff8f), new Color(0xffd98f), EnumWoodType.PINE) { + Pine(TreeBranchDefinition.PINUS, "bullPine", "sabiniana", true, EnumLeafType.CONIFERS, new Color(0xfeff8f), new Color(0xffd98f), EnumForestryWoodType.PINE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPine(tree); @@ -430,7 +428,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Spruce, Larch, 10); } }, - Sequoia(TreeBranchDefinition.SEQUOIA, "coastSequoia", "sempervirens", false, EnumLeafType.CONIFERS, new Color(0x418e71), new Color(0x569896), EnumWoodType.SEQUOIA) { + Sequoia(TreeBranchDefinition.SEQUOIA, "coastSequoia", "sempervirens", false, EnumLeafType.CONIFERS, new Color(0x418e71), new Color(0x569896), EnumForestryWoodType.SEQUOIA) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenSequoia(tree); @@ -455,7 +453,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Larch, Pine, 5); } }, - Gigant(TreeBranchDefinition.SEQUOIADENDRON, "giantSequoia", "giganteum", false, EnumLeafType.CONIFERS, new Color(0x738434), new Color(0x738434).brighter(), EnumWoodType.GIGANTEUM) { + Gigant(TreeBranchDefinition.SEQUOIADENDRON, "giantSequoia", "giganteum", false, EnumLeafType.CONIFERS, new Color(0x738434), new Color(0x738434).brighter(), EnumForestryWoodType.GIGANTEUM) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenGiganteum(tree); @@ -482,7 +480,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // only available by rare villager trade } }, - Jungle(TreeBranchDefinition.TROPICAL, "jungle", "tectona", false, EnumLeafType.JUNGLE, new Color(4764952), new Color(0x658917), 3, Blocks.LOG.getDefaultState().withProperty(BlockOldLog.VARIANT, BlockPlanks.EnumType.JUNGLE)) { + Jungle(TreeBranchDefinition.TROPICAL, "jungle", "tectona", false, EnumLeafType.JUNGLE, new Color(4764952), new Color(0x658917), EnumVanillaWoodType.JUNGLE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle(tree); @@ -506,7 +504,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // vanilla } }, - Teak(TreeBranchDefinition.TECTONA, "teak", "grandis", true, EnumLeafType.JUNGLE, new Color(0xfeff8f), new Color(0xffd98f), EnumWoodType.TEAK) { + Teak(TreeBranchDefinition.TECTONA, "teak", "grandis", true, EnumLeafType.JUNGLE, new Color(0xfeff8f), new Color(0xffd98f), EnumForestryWoodType.TEAK) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTeak(tree); @@ -527,7 +525,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(DarkOak, Jungle, 10); } }, - Ipe(TreeBranchDefinition.TABEBUIA, "ipe", "serratifolia", true, EnumLeafType.JUNGLE, new Color(0xfdd207), new Color(0xad8f04), EnumWoodType.IPE) { + Ipe(TreeBranchDefinition.TABEBUIA, "ipe", "serratifolia", true, EnumLeafType.JUNGLE, new Color(0xfdd207), new Color(0xad8f04), EnumForestryWoodType.IPE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenIpe(tree); @@ -550,7 +548,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Teak, DarkOak, 10); } }, - Kapok(TreeBranchDefinition.CEIBA, "kapok", "pentandra", true, EnumLeafType.JUNGLE, new Color(0x89987b), new Color(0x89aa9e), EnumWoodType.KAPOK) { + Kapok(TreeBranchDefinition.CEIBA, "kapok", "pentandra", true, EnumLeafType.JUNGLE, new Color(0x89987b), new Color(0x89aa9e), EnumForestryWoodType.KAPOK) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenKapok(tree); @@ -574,7 +572,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Jungle, Teak, 10); } }, - Ebony(TreeBranchDefinition.EBONY, "myrtleEbony", "pentamera", true, EnumLeafType.JUNGLE, new Color(0xa2d24a), new Color(0xc4d24a), EnumWoodType.EBONY) { + Ebony(TreeBranchDefinition.EBONY, "myrtleEbony", "pentamera", true, EnumLeafType.JUNGLE, new Color(0xa2d24a), new Color(0xc4d24a), EnumForestryWoodType.EBONY) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenEbony(tree); @@ -600,7 +598,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(DarkOak, Kapok, 10); } }, - Zebrawood(TreeBranchDefinition.ASTRONIUM, "zebrawood", "graveolens", false, EnumLeafType.JUNGLE, new Color(0xa2d24a), new Color(0xc4d24a), EnumWoodType.ZEBRAWOOD) { + Zebrawood(TreeBranchDefinition.ASTRONIUM, "zebrawood", "graveolens", false, EnumLeafType.JUNGLE, new Color(0xa2d24a), new Color(0xc4d24a), EnumForestryWoodType.ZEBRAWOOD) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenZebrawood(tree); @@ -622,7 +620,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Ebony, Poplar, 5); } }, - Mahogony(TreeBranchDefinition.MAHOGANY, "yellowMeranti", "gibbosa", true, EnumLeafType.JUNGLE, new Color(0x8ab154), new Color(0xa9b154), EnumWoodType.MAHOGANY) { + Mahogony(TreeBranchDefinition.MAHOGANY, "yellowMeranti", "gibbosa", true, EnumLeafType.JUNGLE, new Color(0x8ab154), new Color(0xa9b154), EnumForestryWoodType.MAHOGANY) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenMahogany(tree); @@ -646,7 +644,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Kapok, Ebony, 10); } }, - AcaciaVanilla(TreeBranchDefinition.ACACIA, "acacia", "aneura", true, EnumLeafType.DECIDUOUS, new Color(0x616101), new Color(0xb3b302), 4, Blocks.LOG2.getDefaultState().withProperty(BlockNewLog.VARIANT, BlockPlanks.EnumType.ACACIA)) { + AcaciaVanilla(TreeBranchDefinition.ACACIA, "acacia", "aneura", true, EnumLeafType.DECIDUOUS, new Color(0x616101), new Color(0xb3b302), EnumVanillaWoodType.ACACIA) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenAcaciaVanilla(tree); @@ -668,7 +666,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe // vanilla } }, - Acacia(TreeBranchDefinition.ACACIA, "desertAcacia", "erioloba", true, EnumLeafType.DECIDUOUS, new Color(0x748C1C), new Color(0xb3b302), EnumWoodType.ACACIA) { + Acacia(TreeBranchDefinition.ACACIA, "desertAcacia", "erioloba", true, EnumLeafType.DECIDUOUS, new Color(0x748C1C), new Color(0xb3b302), EnumForestryWoodType.ACACIA) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenAcacia(tree); @@ -691,7 +689,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Teak, Balsa, 10); } }, - Padauk(TreeBranchDefinition.PTEROCARPUS, "padauk", "soyauxii", true, EnumLeafType.DECIDUOUS, new Color(0xd0df8c), new Color(0x435c32), EnumWoodType.PADAUK) { + Padauk(TreeBranchDefinition.PTEROCARPUS, "padauk", "soyauxii", true, EnumLeafType.DECIDUOUS, new Color(0xd0df8c), new Color(0x435c32), EnumForestryWoodType.PADAUK) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPadauk(tree); @@ -713,7 +711,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(AcaciaVanilla, Jungle, 10); } }, - Balsa(TreeBranchDefinition.OCHROMA, "balsa", "pyramidale", true, EnumLeafType.DECIDUOUS, new Color(0x59ac00), new Color(0xfeff8f), EnumWoodType.BALSA) { + Balsa(TreeBranchDefinition.OCHROMA, "balsa", "pyramidale", true, EnumLeafType.DECIDUOUS, new Color(0x59ac00), new Color(0xfeff8f), EnumForestryWoodType.BALSA) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBalsa(tree); @@ -737,7 +735,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Teak, AcaciaVanilla, 10); } }, - Cocobolo(TreeBranchDefinition.DALBERGIA, "cocobolo", "retusa", false, EnumLeafType.DECIDUOUS, new Color(0x6aa17a), new Color(0x487d4c), EnumWoodType.COCOBOLO) { + Cocobolo(TreeBranchDefinition.DALBERGIA, "cocobolo", "retusa", false, EnumLeafType.DECIDUOUS, new Color(0x6aa17a), new Color(0x487d4c), EnumForestryWoodType.COCOBOLO) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenCocobolo(tree); @@ -758,7 +756,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Acacia, DarkOak, 10); } }, - Wenge(TreeBranchDefinition.MILLETTIA, "wenge", "laurentii", true, EnumLeafType.DECIDUOUS, new Color(0xada157), new Color(0xad8a57), EnumWoodType.WENGE) { + Wenge(TreeBranchDefinition.MILLETTIA, "wenge", "laurentii", true, EnumLeafType.DECIDUOUS, new Color(0xada157), new Color(0xad8a57), EnumForestryWoodType.WENGE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenWenge(tree); @@ -781,7 +779,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Cocobolo, Balsa, 10); } }, - Baobab(TreeBranchDefinition.ADANSONIA, "grandidierBaobab", "digitata", true, EnumLeafType.DECIDUOUS, new Color(0xfeff8f), new Color(0xffd98f), EnumWoodType.BAOBAB) { + Baobab(TreeBranchDefinition.ADANSONIA, "grandidierBaobab", "digitata", true, EnumLeafType.DECIDUOUS, new Color(0xfeff8f), new Color(0xffd98f), EnumForestryWoodType.BAOBAB) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBaobab(tree); @@ -807,7 +805,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Balsa, Wenge, 10); } }, - Mahoe(TreeBranchDefinition.TALIPARITI, "blueMahoe", "elatum", true, EnumLeafType.DECIDUOUS, new Color(0xa0ba1b), new Color(0x79a175), EnumWoodType.MAHOE) { + Mahoe(TreeBranchDefinition.TALIPARITI, "blueMahoe", "elatum", true, EnumLeafType.DECIDUOUS, new Color(0xa0ba1b), new Color(0x79a175), EnumForestryWoodType.MAHOE) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenMahoe(tree); @@ -832,7 +830,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Balsa, Acacia, 5); } }, - Willow(TreeBranchDefinition.SALIX, "whiteWillow", "alba", true, EnumLeafType.WILLOW, new Color(0xa3b8a5), new Color(0xa3b850), EnumWoodType.WILLOW) { + Willow(TreeBranchDefinition.SALIX, "whiteWillow", "alba", true, EnumLeafType.WILLOW, new Color(0xa3b8a5), new Color(0xa3b850), EnumForestryWoodType.WILLOW) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenWillow(tree); @@ -865,7 +863,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe .restrictHumidity(EnumHumidity.DAMP); } }, - Sipiri(TreeBranchDefinition.CHLOROCARDIUM, "sipiri", "rodiei", true, EnumLeafType.DECIDUOUS, new Color(0x678911), new Color(0x79a175), EnumWoodType.GREENHEART) { + Sipiri(TreeBranchDefinition.CHLOROCARDIUM, "sipiri", "rodiei", true, EnumLeafType.DECIDUOUS, new Color(0x678911), new Color(0x79a175), EnumForestryWoodType.GREENHEART) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenGreenheart(tree); @@ -891,7 +889,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe .restrictHumidity(EnumHumidity.DAMP); } }, - Papaya(TreeBranchDefinition.CARICA, "papaya", "papaya", true, EnumLeafType.PALM, new Color(0x6d9f58), new Color(0x75E675), EnumWoodType.PAPAYA) { + Papaya(TreeBranchDefinition.CARICA, "papaya", "papaya", true, EnumLeafType.PALM, new Color(0x6d9f58), new Color(0x75E675), EnumForestryWoodType.PAPAYA) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPapaya(tree); @@ -916,7 +914,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Jungle, Cherry, 5); } }, - Date(TreeBranchDefinition.PHOENIX, "datePalm", "dactylifera", true, EnumLeafType.PALM, new Color(0xcbcd79), new Color(0xB3F370), EnumWoodType.PALM) { + Date(TreeBranchDefinition.PHOENIX, "datePalm", "dactylifera", true, EnumLeafType.PALM, new Color(0xcbcd79), new Color(0xB3F370), EnumForestryWoodType.PALM) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenDate(tree); @@ -942,7 +940,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe registerMutation(Jungle, Papaya, 5); } }, - Poplar(TreeBranchDefinition.POPULUS, "whitePoplar", "alba", true, EnumLeafType.DECIDUOUS, new Color(0xa3b8a5), new Color(0x539d12), EnumWoodType.POPLAR) { + Poplar(TreeBranchDefinition.POPULUS, "whitePoplar", "alba", true, EnumLeafType.DECIDUOUS, new Color(0xa3b8a5), new Color(0x539d12), EnumForestryWoodType.POPLAR) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPoplar(tree); @@ -974,52 +972,27 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe private final TreeBranchDefinition branch; private final IAlleleTreeSpecies species; - private final EnumWoodType woodType; // for forestry trees - private final IBlockState vanillaWood; // for vanilla trees + private final IWoodType woodType; private IAllele[] template; private ITreeGenome genome; - // vanilla tree constructor - TreeDefinition(TreeBranchDefinition branch, String speciesName, String binomial, boolean dominant, EnumLeafType leafType, Color primary, Color secondary, int vanillaMeta, IBlockState vanillaWood) { - String uid = "forestry.tree" + this; - String unlocalizedDescription = "for.description.tree" + this; - String unlocalizedName = "for.trees.species." + speciesName; - String modelName = uid.substring("forestry.".length()); - - this.branch = branch; - - ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); - IGermlingModelProvider germlingIconProvider = new ModelProviderGermlingVanilla(vanillaMeta); - IWoodProvider woodProvider = new WoodProviderVanilla(vanillaMeta); - - IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, Constants.MOD_ID, modelName, leafIconProvider, germlingIconProvider, woodProvider, this); - setSpeciesProperties(speciesBuilder); - this.species = speciesBuilder.build(); - - this.woodType = null; - this.vanillaWood = vanillaWood; - } - - // forestry tree constructor - TreeDefinition(TreeBranchDefinition branch, String speciesName, String binomial, boolean dominant, EnumLeafType leafType, Color primary, Color secondary, EnumWoodType woodType) { + TreeDefinition(TreeBranchDefinition branch, String speciesName, String binomial, boolean dominant, EnumLeafType leafType, Color primary, Color secondary, IWoodType woodType) { String uid = Constants.MOD_ID + ".tree" + this; String unlocalizedDescription = "for.description.tree" + this; String unlocalizedName = "for.trees.species." + speciesName; - String modelName = uid.substring("forestry.".length()); this.branch = branch; ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary); - IGermlingModelProvider germlingIconProvider = new ModelProviderGermling(uid); - IWoodProvider woodProvider = new WoodProvider(woodType.toString().toLowerCase(Locale.ENGLISH), woodType); + IGermlingModelProvider germlingIconProvider = ModelProviderFactory.create(woodType, uid); + IWoodProvider woodProvider = WoodProviderFactory.create(woodType); - IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, Constants.MOD_ID, modelName, leafIconProvider, germlingIconProvider, woodProvider, this); + IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, Constants.MOD_ID, leafIconProvider, germlingIconProvider, woodProvider, this); setSpeciesProperties(speciesBuilder); this.species = speciesBuilder.build(); this.woodType = woodType; - this.vanillaWood = null; } protected abstract void setSpeciesProperties(IAlleleTreeSpeciesBuilder treeSpecies); @@ -1030,14 +1003,10 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator, IStringSe @Override public boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { - IBlockState logBlock; - if (woodType == null) { - logBlock = vanillaWood; - } else { - AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); - boolean fireproof = fireproofAllele.getValue(); - logBlock = TreeManager.woodAccess.getLogBlock(woodType, fireproof); - } + AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); + boolean fireproof = fireproofAllele.getValue(); + IBlockState logBlock = TreeManager.woodAccess.getBlock(woodType, WoodBlockKind.LOG, fireproof); + BlockLog.EnumAxis axis = BlockLog.EnumAxis.fromFacingAxis(facing.getAxis()); return world.setBlockState(pos, logBlock.withProperty(BlockLog.LOG_AXIS, axis)); } diff --git a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java index 0a27eabc4..92932d875 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeFactory.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeFactory.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.arboriculture.genetics; +import javax.annotation.Nonnull; import java.awt.Color; import forestry.api.arboriculture.EnumLeafType; @@ -25,8 +26,8 @@ import forestry.arboriculture.models.SpriteProviderLeaves; public class TreeFactory implements ITreeFactory { @Override - public IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, IWoodProvider woodProvider, ITreeGenerator generator) { - return new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modID, modelName, leafSpriteProvider, germlingModelProvider, woodProvider, generator); + public IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modID, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, @Nonnull IWoodProvider woodProvider, ITreeGenerator generator) { + return new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modID, leafSpriteProvider, germlingModelProvider, woodProvider, generator); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/WoodProvider.java b/src/main/java/forestry/arboriculture/genetics/WoodProvider.java index fad82c21a..76c6503fd 100644 --- a/src/main/java/forestry/arboriculture/genetics/WoodProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/WoodProvider.java @@ -10,34 +10,43 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import forestry.api.arboriculture.EnumWoodType; -import forestry.api.arboriculture.IWoodProvider; -import forestry.api.arboriculture.TreeManager; -import forestry.api.core.ITextureManager; -import forestry.core.render.ForestryResource; -import forestry.core.render.TextureManager; +import javax.annotation.Nonnull; +import java.util.Locale; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.ITextureManager; +import forestry.core.config.Constants; +import forestry.core.proxy.Proxies; public class WoodProvider implements IWoodProvider { private final String name; - private final EnumWoodType woodType; - private TextureAtlasSprite woodTop; - private TextureAtlasSprite woodBark; + private final EnumForestryWoodType woodType; + private TextureAtlasSprite woodTop; + private TextureAtlasSprite woodBark; - public WoodProvider(String name, EnumWoodType woodType) { - this.name = name; + public WoodProvider(EnumForestryWoodType woodType) { + this.name = woodType.toString().toLowerCase(Locale.ENGLISH); this.woodType = woodType; } @Override public void registerSprites(Item item, ITextureManager manager) { - woodTop = TextureManager.registerSprite(new ForestryResource("blocks/wood/heart." + name)); - woodBark = TextureManager.registerSprite(new ForestryResource("blocks/wood/bark." + name)); + TextureMap textureMap = Proxies.common.getClientInstance().getTextureMapBlocks(); + woodTop = textureMap.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/wood/heart." + name)); + woodBark = textureMap.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/wood/bark." + name)); } + @Nonnull @Override public TextureAtlasSprite getSprite(boolean isTop) { if(isTop){ @@ -49,7 +58,7 @@ public class WoodProvider implements IWoodProvider { @Override public ItemStack getWoodStack() { - return TreeManager.woodAccess.getLog(woodType, false); + return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, false); } } diff --git a/src/main/java/forestry/arboriculture/genetics/WoodProviderFactory.java b/src/main/java/forestry/arboriculture/genetics/WoodProviderFactory.java new file mode 100644 index 000000000..e89826a73 --- /dev/null +++ b/src/main/java/forestry/arboriculture/genetics/WoodProviderFactory.java @@ -0,0 +1,18 @@ +package forestry.arboriculture.genetics; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.IWoodType; + +public class WoodProviderFactory { + public static IWoodProvider create(IWoodType woodType) { + if (woodType instanceof EnumVanillaWoodType) { + return new WoodProviderVanilla((EnumVanillaWoodType) woodType); + } else if (woodType instanceof EnumForestryWoodType) { + return new WoodProvider((EnumForestryWoodType) woodType); + } else { + throw new IllegalArgumentException("Unknown wood type: " + woodType); + } + } +} diff --git a/src/main/java/forestry/arboriculture/genetics/WoodProviderVanilla.java b/src/main/java/forestry/arboriculture/genetics/WoodProviderVanilla.java index 26ee4dc3c..0d65126d4 100644 --- a/src/main/java/forestry/arboriculture/genetics/WoodProviderVanilla.java +++ b/src/main/java/forestry/arboriculture/genetics/WoodProviderVanilla.java @@ -10,71 +10,77 @@ ******************************************************************************/ package forestry.arboriculture.genetics; -import forestry.api.arboriculture.IWoodProvider; -import forestry.api.core.ITextureManager; -import forestry.core.render.TextureManager; +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.api.core.ITextureManager; +import forestry.core.proxy.Proxies; + public class WoodProviderVanilla implements IWoodProvider { - private final int vanillaMap; - private TextureAtlasSprite woodTop; - private TextureAtlasSprite woodBark; + private final EnumVanillaWoodType woodType; + private TextureAtlasSprite woodTop; + private TextureAtlasSprite woodBark; - public WoodProviderVanilla(int vanillaMap) { - this.vanillaMap = vanillaMap; + public WoodProviderVanilla(EnumVanillaWoodType woodType) { + this.woodType = woodType; } @Override public void registerSprites(Item item, ITextureManager manager) { - String name = ""; - switch (vanillaMap) { - case 0: - name = "oak"; - break; - case 1: - name = "spruce"; - break; - case 2: - name = "birch"; - break; - case 3: - name = "jungle"; - break; - case 4: - name = "acacia"; - break; - case 5: - name = "big_oak"; - break; - } - woodTop = TextureManager.registerSprite(new ResourceLocation("minecraft:blocks/log_" + name + "_top")); - woodBark = TextureManager.registerSprite(new ResourceLocation("minecraft:blocks/log_" + name)); + String name; + switch (woodType) { + case OAK: + name = "oak"; + break; + case SPRUCE: + name = "spruce"; + break; + case BIRCH: + name = "birch"; + break; + case JUNGLE: + name = "jungle"; + break; + case ACACIA: + name = "acacia"; + break; + case DARK_OAK: + name = "big_oak"; + break; + default: + return; + } + + TextureMap textureMap = Proxies.common.getClientInstance().getTextureMapBlocks(); + woodTop = textureMap.registerSprite(new ResourceLocation("minecraft", "blocks/log_" + name + "_top")); + woodBark = textureMap.registerSprite(new ResourceLocation("minecraft", "blocks/log_" + name)); } + @Nonnull @Override public TextureAtlasSprite getSprite(boolean isTop) { - if(isTop){ + if (isTop) { return woodTop; - }else{ + } else { return woodBark; } } @Override public ItemStack getWoodStack() { - Block block; - if(vanillaMap < 4){ - block = Blocks.LOG; - }else{ - block = Blocks.LOG2; - } - return new ItemStack(block, 1, vanillaMap >= 4? vanillaMap - 4 : vanillaMap); + return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.LOG, false); } } diff --git a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java index 354de52fb..d6c4cfa2c 100644 --- a/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java +++ b/src/main/java/forestry/arboriculture/genetics/alleles/AlleleTreeSpecies.java @@ -49,8 +49,6 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci @Nonnull private final List fruits = new ArrayList<>(); @Nonnull - private final String modelName; - @Nonnull private final String modID; @Nonnull private EnumPlantType nativeType = EnumPlantType.Plains; @@ -64,7 +62,6 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci @Nonnull IClassification branch, @Nonnull String binomial, @Nonnull String modID, - @Nonnull String modelName, @Nonnull ILeafSpriteProvider leafIconProvider, @Nonnull IGermlingModelProvider germlingModelProvider, @Nonnull IWoodProvider woodProvider, @@ -77,7 +74,6 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci this.leafSpriteProvider = leafIconProvider; this.modID = modID; - this.modelName = modelName; } @Override @@ -168,12 +164,6 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci return modID; } - @Nonnull - @Override - public String getModelName() { - return modelName; - } - @Override public int compareTo(@Nonnull IAlleleTreeSpecies o) { return 0; diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java index d1e685b18..3f788c19f 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWood.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWood.java @@ -13,7 +13,7 @@ package forestry.arboriculture.items; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.WoodHelper; import forestry.core.items.ItemBlockForestry; @@ -27,7 +27,7 @@ public class ItemBlockWood extends ItemBlockForest public String getItemStackDisplayName(ItemStack itemstack) { IWoodTyped wood = getBlock(); int meta = itemstack.getMetadata(); - EnumWoodType woodType = wood.getWoodType(meta); + IWoodType woodType = wood.getWoodType(meta); return WoodHelper.getDisplayName(wood, woodType); } diff --git a/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java b/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java index 3acedaad5..a82b3eaba 100644 --- a/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java +++ b/src/main/java/forestry/arboriculture/items/ItemBlockWoodSlab.java @@ -3,20 +3,20 @@ package forestry.arboriculture.items; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; -import forestry.api.arboriculture.EnumWoodType; +import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.WoodHelper; -import forestry.arboriculture.blocks.BlockArbSlab; +import forestry.arboriculture.blocks.slab.BlockForestrySlab; public class ItemBlockWoodSlab extends ItemSlab { - public ItemBlockWoodSlab(BlockArbSlab block, BlockArbSlab slab, BlockArbSlab doubleSlab) { + public ItemBlockWoodSlab(BlockForestrySlab block, BlockForestrySlab slab, BlockForestrySlab doubleSlab) { super(block, slab, doubleSlab); } @Override public String getItemStackDisplayName(ItemStack itemstack) { - BlockArbSlab wood = (BlockArbSlab) getBlock(); + BlockForestrySlab wood = (BlockForestrySlab) getBlock(); int meta = itemstack.getMetadata(); - EnumWoodType woodType = wood.getWoodType(meta); + IWoodType woodType = wood.getWoodType(meta); return WoodHelper.getDisplayName(wood, woodType); } } diff --git a/src/main/java/forestry/arboriculture/models/ModelProviderFactory.java b/src/main/java/forestry/arboriculture/models/ModelProviderFactory.java new file mode 100644 index 000000000..4d014d67a --- /dev/null +++ b/src/main/java/forestry/arboriculture/models/ModelProviderFactory.java @@ -0,0 +1,20 @@ +package forestry.arboriculture.models; + +import javax.annotation.Nonnull; + +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IGermlingModelProvider; +import forestry.api.arboriculture.IWoodType; + +public class ModelProviderFactory { + public static IGermlingModelProvider create(@Nonnull IWoodType woodType, String modelUid) { + if (woodType instanceof EnumVanillaWoodType) { + return new ModelProviderGermlingVanilla((EnumVanillaWoodType) woodType); + } else if (woodType instanceof EnumForestryWoodType) { + return new ModelProviderGermling(modelUid); + } else { + throw new IllegalArgumentException("Unknown wood type: " + woodType); + } + } +} diff --git a/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java b/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java index 5f5e660de..58d411479 100644 --- a/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java +++ b/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java @@ -28,8 +28,8 @@ public class ModelProviderGermling implements IGermlingModelProvider { private ModelResourceLocation pollenModel; private ModelResourceLocation charcoalModel; - public ModelProviderGermling(String uid) { - this.name = uid.substring("forestry.".length()); + public ModelProviderGermling(String modelUid) { + this.name = modelUid.substring("forestry.".length()); } @Override diff --git a/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java b/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java index 929f3e58f..1917d7ac1 100644 --- a/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java +++ b/src/main/java/forestry/arboriculture/models/ModelProviderGermlingVanilla.java @@ -14,42 +14,44 @@ import javax.annotation.Nonnull; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; + import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.core.IModelManager; public class ModelProviderGermlingVanilla implements IGermlingModelProvider { - private final int vanillaMap; + private final EnumVanillaWoodType woodType; private ModelResourceLocation germlingModel; private ModelResourceLocation pollenModel; private ModelResourceLocation charcoalModel; - public ModelProviderGermlingVanilla(int vanillaMap) { - this.vanillaMap = vanillaMap; + public ModelProviderGermlingVanilla(EnumVanillaWoodType woodType) { + this.woodType = woodType; } @Override public void registerModels(Item item, IModelManager manager, EnumGermlingType type) { if(type == EnumGermlingType.SAPLING){ - switch (vanillaMap) { - case 0: + switch (woodType) { + case OAK: germlingModel = manager.getModelLocation("minecraft", "oak_sapling"); break; - case 1: + case SPRUCE: germlingModel = manager.getModelLocation("minecraft", "spruce_sapling"); break; - case 2: + case BIRCH: germlingModel = manager.getModelLocation("minecraft", "birch_sapling"); break; - case 3: + case JUNGLE: germlingModel = manager.getModelLocation("minecraft", "jungle_sapling"); break; - case 4: + case ACACIA: germlingModel = manager.getModelLocation("minecraft", "acacia_sapling"); break; - case 5: + case DARK_OAK: germlingModel = manager.getModelLocation("minecraft", "dark_oak_sapling"); break; } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/ebony.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json index 85c0bb90d..7e8460fa4 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/ebony.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ebony_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ebony_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ebony_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ebony_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/acacia_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/acacia_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/acacia_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/acacia_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/balsa.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/cherry.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/balsa.json index ddaf3688f..136b9519c 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/cherry.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/balsa.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cherry_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cherry_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cherry_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cherry_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/balsa_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/balsa_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/balsa_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/balsa_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/baobab.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/balsa.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/baobab.json index d07771421..95c037766 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/balsa.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/baobab.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/balsa_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/balsa_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/balsa_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/balsa_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/baobab_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/baobab_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/baobab_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/baobab_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/cherry.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/maple.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/cherry.json index 0af61abdc..6e94cde9b 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/maple.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/cherry.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/maple_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/maple_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/maple_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/maple_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cherry_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cherry_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cherry_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cherry_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/chestnut.json similarity index 53% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/baobab.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/chestnut.json index 73afd47bf..be8f9e978 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/baobab.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/chestnut.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/baobab_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/baobab_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/baobab_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/baobab_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/chestnut_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/chestnut_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/chestnut_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/chestnut_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/citrus.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/kapok.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/citrus.json index 7b2282ce8..8c862a557 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/kapok.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/citrus.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/kapok_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/kapok_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/kapok_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/kapok_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/citrus_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/citrus_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/citrus_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/citrus_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/cocobolo.json new file mode 100644 index 000000000..6cd4c5a33 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/cocobolo.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/cocobolo_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/cocobolo_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/cocobolo_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/cocobolo_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/ebony.json new file mode 100644 index 000000000..d00e0e522 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/ebony.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ebony_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ebony_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ebony_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ebony_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/giganteum.json new file mode 100644 index 000000000..432694a13 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/giganteum.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/giganteum_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/giganteum_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/giganteum_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/giganteum_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/greenheart.json similarity index 52% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/giganteum.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/greenheart.json index fc6ba6f20..87e00c9a7 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/giganteum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/greenheart.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/giganteum_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/giganteum_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/giganteum_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/giganteum_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/greenheart_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/greenheart_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/greenheart_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/greenheart_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/ipe.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/ipe.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/ipe.json index ae7996489..a35d1ea5e 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/ipe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/ipe.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/ipe_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/ipe_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/ipe_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/ipe_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/ipe_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/ipe_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/ipe_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/ipe_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/kapok.json similarity index 56% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/pine.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/kapok.json index 7bb580017..43cab084a 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/pine.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/kapok.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/pine_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/pine_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/pine_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/pine_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/kapok_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/kapok_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/kapok_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/kapok_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/larch.json new file mode 100644 index 000000000..baeb9b1ef --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/larch.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/larch_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/larch_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/larch_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/larch_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/lime.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/lime.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/lime.json index 1df35d1e5..0fd31e7a7 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/lime.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/lime.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/lime_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/lime_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/lime_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/lime_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/lime_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/lime_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/lime_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/lime_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahoe.json new file mode 100644 index 000000000..5702133ef --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahoe.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahoe_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahoe_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahoe_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahoe_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahogany.json new file mode 100644 index 000000000..689189907 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahogany.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/mahogany_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/mahogany_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/mahogany_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/mahogany_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/maple.json new file mode 100644 index 000000000..b5b07f77a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/maple.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/maple_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/maple_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/maple_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/maple_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/padauk.json new file mode 100644 index 000000000..c427b6582 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/padauk.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/padauk_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/padauk_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/padauk_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/padauk_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/palm.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/palm.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/palm.json index 5e9f94fe8..884278750 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/palm.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/palm.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/palm_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/palm_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/palm_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/palm_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/palm_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/palm_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/palm_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/palm_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/papaya.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/larch.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/papaya.json index 0d6b0ba8d..7ed501e2a 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/larch.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/papaya.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/larch_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/larch_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/larch_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/larch_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/papaya_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/papaya_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/papaya_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/papaya_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/pine.json new file mode 100644 index 000000000..5b617422c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/pine.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/pine_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/pine_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/pine_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/pine_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/plum.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/plum.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/plum.json index 1bcff5b97..f3693b55f 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/plum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/plum.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/plum_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/plum_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/plum_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/plum_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/plum_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/plum_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/plum_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/plum_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/poplar.json new file mode 100644 index 000000000..24ccbff04 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/poplar.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/poplar_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/poplar_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/poplar_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/poplar_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/sequoia.json similarity index 53% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/acacia.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/sequoia.json index 5f212e95e..aad1b5dc8 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/acacia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/sequoia.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/acacia_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/acacia_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/acacia_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/acacia_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/sequoia_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/sequoia_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/sequoia_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/sequoia_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/teak.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/doors/teak.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door/teak.json index 83fb0ccbd..a9c54c877 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/teak.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/teak.json @@ -1,36 +1,36 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/teak_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/teak_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/teak_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/teak_top", "y": 180 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/teak_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/teak_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/teak_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/teak_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/walnut.json new file mode 100644 index 000000000..14bee8afe --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/walnut.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/walnut_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/walnut_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/walnut_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/walnut_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/wenge.json new file mode 100644 index 000000000..18d5e2a91 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/wenge.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/wenge_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/wenge_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/wenge_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/wenge_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/willow.json new file mode 100644 index 000000000..ebe4ac2cc --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/willow.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/willow_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/willow_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/willow_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/willow_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/zebrawood.json new file mode 100644 index 000000000..bdd08c1b6 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door/zebrawood.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door/zebrawood_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door/zebrawood_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door/zebrawood_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door/zebrawood_top", "y": 180 } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/chestnut.json deleted file mode 100644 index fe674008a..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/chestnut.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/chestnut_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/chestnut_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/chestnut_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/chestnut_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/citrus.json deleted file mode 100644 index 2920b4d2a..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/citrus.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/citrus_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/citrus_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/citrus_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/citrus_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/cocobolo.json deleted file mode 100644 index 4d9176b03..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/cocobolo.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/cocobolo_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/cocobolo_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/greenheart.json deleted file mode 100644 index 4222abb15..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/greenheart.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/greenheart_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/greenheart_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/greenheart_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/greenheart_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahoe.json deleted file mode 100644 index d49f35062..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahoe.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahoe_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahoe_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahoe_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahoe_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahogany.json deleted file mode 100644 index d4e30e073..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/mahogany.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/mahogany_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/mahogany_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/mahogany_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/mahogany_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/padauk.json deleted file mode 100644 index 976dae8c1..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/padauk.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/padauk_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/padauk_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/padauk_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/padauk_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/papaya.json deleted file mode 100644 index fced15a91..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/papaya.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/papaya_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/papaya_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/papaya_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/papaya_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/poplar.json deleted file mode 100644 index 927006983..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/poplar.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/poplar_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/poplar_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/poplar_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/poplar_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/sequoia.json deleted file mode 100644 index fbdd55b8c..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/sequoia.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/sequoia_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/sequoia_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/sequoia_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/sequoia_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/walnut.json deleted file mode 100644 index ffcd52436..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/walnut.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/walnut_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/walnut_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/walnut_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/walnut_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/wenge.json deleted file mode 100644 index d3c1cc9d3..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/wenge.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/wenge_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/wenge_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/wenge_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/wenge_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/willow.json deleted file mode 100644 index 76d76eef1..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/willow.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/willow_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/willow_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/willow_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/willow_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/doors/zebrawood.json deleted file mode 100644 index 2e82293cf..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/doors/zebrawood.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom" }, - "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom" }, - "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top" }, - "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top_rh" }, - "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/doors/zebrawood_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top_rh" }, - "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top" }, - "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/doors/zebrawood_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/acacia.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/acacia.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/acacia.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/balsa.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/balsa.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/balsa.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/baobab.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/baobab.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/baobab.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cherry.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/cherry.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cherry.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/chestnut.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/chestnut.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/chestnut.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/citrus.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/citrus.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/citrus.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cocobolo.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/cocobolo.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cocobolo.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ebony.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/ebony.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ebony.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/giganteum.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/giganteum.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/giganteum.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/greenheart.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/greenheart.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/greenheart.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ipe.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/ipe.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ipe.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/kapok.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/kapok.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/kapok.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/larch.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/larch.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/larch.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/lime.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/lime.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/lime.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahoe.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/mahoe.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahoe.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahogany.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/mahogany.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahogany.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/maple.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/maple.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/maple.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/padauk.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/padauk.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/padauk.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/palm.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/palm.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/palm.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/papaya.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/papaya.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/papaya.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/pine.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/pine.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/pine.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/plum.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/plum.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/plum.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/poplar.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/poplar.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/poplar.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/sequoia.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/sequoia.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/sequoia.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/teak.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/teak.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/teak.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/walnut.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/walnut.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/walnut.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/wenge.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/wenge.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/wenge.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/willow.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/willow.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/willow.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/zebrawood.json similarity index 100% rename from src/main/resources/assets/forestry/blockstates/arboriculture/slab/double/zebrawood.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/zebrawood.json diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json new file mode 100644 index 000000000..f251ac49e --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/acacia_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/acacia_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/acacia_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/acacia_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/acacia_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/balsa.json new file mode 100644 index 000000000..e30fb4755 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/balsa.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/balsa_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/balsa_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/balsa_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/balsa_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/balsa_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/baobab.json new file mode 100644 index 000000000..ed327bc37 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/baobab.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/baobab_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/baobab_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/baobab_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/baobab_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/baobab_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cherry.json new file mode 100644 index 000000000..00f9cd1fb --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cherry.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/cherry_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cherry_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cherry_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cherry_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cherry_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/chestnut.json new file mode 100644 index 000000000..3b8ab6d81 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/chestnut.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/chestnut_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/chestnut_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/chestnut_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/chestnut_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/chestnut_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/citrus.json new file mode 100644 index 000000000..289d6e382 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/citrus.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/citrus_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/citrus_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/citrus_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/citrus_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/citrus_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cocobolo.json new file mode 100644 index 000000000..1e510020c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cocobolo.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/cocobolo_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cocobolo_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cocobolo_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cocobolo_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/cocobolo_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ebony.json new file mode 100644 index 000000000..f4d8b13e3 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ebony.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/ebony_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ebony_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ebony_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ebony_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ebony_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/giganteum.json new file mode 100644 index 000000000..5eab0b811 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/giganteum.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/giganteum_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/giganteum_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/giganteum_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/giganteum_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/giganteum_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/greenheart.json new file mode 100644 index 000000000..d1190e701 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/greenheart.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/greenheart_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/greenheart_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/greenheart_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/greenheart_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/greenheart_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ipe.json new file mode 100644 index 000000000..99bbfc718 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ipe.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/ipe_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ipe_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ipe_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ipe_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/ipe_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/kapok.json new file mode 100644 index 000000000..06afa37f5 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/kapok.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/kapok_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/kapok_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/kapok_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/kapok_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/kapok_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/larch.json new file mode 100644 index 000000000..8ee724b8b --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/larch.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/larch_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/larch_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/larch_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/larch_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/larch_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/lime.json new file mode 100644 index 000000000..be098f6d5 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/lime.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/lime_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/lime_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/lime_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/lime_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/lime_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahoe.json new file mode 100644 index 000000000..538d47518 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahoe.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/mahoe_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahoe_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahoe_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahoe_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahoe_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahogany.json new file mode 100644 index 000000000..bcbdd9064 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahogany.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/mahogany_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahogany_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahogany_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahogany_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/mahogany_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/maple.json new file mode 100644 index 000000000..789a42bfa --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/maple.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/maple_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/maple_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/maple_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/maple_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/maple_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/padauk.json new file mode 100644 index 000000000..000b4de23 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/padauk.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/padauk_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/padauk_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/padauk_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/padauk_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/padauk_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/palm.json new file mode 100644 index 000000000..cf1427779 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/palm.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/palm_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/palm_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/palm_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/palm_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/palm_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/papaya.json new file mode 100644 index 000000000..3cdd93671 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/papaya.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/papaya_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/papaya_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/papaya_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/papaya_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/papaya_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/pine.json new file mode 100644 index 000000000..bfb0947ae --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/pine.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/pine_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/pine_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/pine_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/pine_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/pine_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/plum.json new file mode 100644 index 000000000..f529343bf --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/plum.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/plum_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/plum_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/plum_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/plum_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/plum_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/poplar.json new file mode 100644 index 000000000..18f8a8b9b --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/poplar.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/poplar_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/poplar_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/poplar_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/poplar_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/poplar_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/sequoia.json new file mode 100644 index 000000000..8119d0c7a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/sequoia.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/sequoia_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/sequoia_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/sequoia_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/sequoia_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/sequoia_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/teak.json new file mode 100644 index 000000000..bbe625679 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/teak.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/teak_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/teak_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/teak_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/teak_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/teak_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/walnut.json new file mode 100644 index 000000000..3080d91d4 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/walnut.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/walnut_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/walnut_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/walnut_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/walnut_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/walnut_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/wenge.json new file mode 100644 index 000000000..56cfa458b --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/wenge.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/wenge_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/wenge_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/wenge_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/wenge_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/wenge_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/willow.json new file mode 100644 index 000000000..ad8556aa5 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/willow.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/willow_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/willow_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/willow_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/willow_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/willow_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/zebrawood.json new file mode 100644 index 000000000..ac19d4761 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/zebrawood.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fence/zebrawood_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fence/zebrawood_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fence/zebrawood_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fence/zebrawood_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fence/zebrawood_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/larch.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json index 07b4210ba..e6312fd58 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/larch.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/larch_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/larch_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/larch_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/larch_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/larch_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/larch_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/larch_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/larch_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/larch_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/larch_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/larch_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/larch_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/larch_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/larch_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/larch_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/larch_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/acacia_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/acacia_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/balsa.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/lime.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/balsa.json index a3a30fbd3..d86b264a1 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/lime.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/balsa.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/lime_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/lime_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/lime_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/lime_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/lime_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/lime_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/lime_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/lime_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/lime_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/lime_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/lime_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/lime_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/lime_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/lime_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/lime_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/lime_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/balsa_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/balsa_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/baobab.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/ebony.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/baobab.json index 902a7b324..89b37eaf3 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/ebony.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/baobab.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ebony_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ebony_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/baobab_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/baobab_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cherry.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/balsa.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cherry.json index ea363c4be..956f7f708 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/balsa.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cherry.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/balsa_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/balsa_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cherry_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cherry_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/chestnut.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/sequoia.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/chestnut.json index 1823b913f..821fcacf4 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/sequoia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/chestnut.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/sequoia_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/chestnut_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/citrus.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/kapok.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/citrus.json index 7564f5c8d..83bf0dff6 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/kapok.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/citrus.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/kapok_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/kapok_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/citrus_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/citrus_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cocobolo.json similarity index 51% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/citrus.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cocobolo.json index 3e3c9487f..c42bac017 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/citrus.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cocobolo.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/citrus_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/citrus_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/cocobolo_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ebony.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/pine.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ebony.json index 3f53ce83f..1057c0355 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/pine.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ebony.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/pine_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/pine_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/pine_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/pine_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/pine_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/pine_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/pine_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/pine_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/pine_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/pine_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/pine_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/pine_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/pine_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/pine_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/pine_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/pine_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ebony_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ebony_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/giganteum.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/chestnut.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/giganteum.json index 113d3b75b..9108ae970 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/chestnut.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/giganteum.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/chestnut_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/giganteum_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/greenheart.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/zebrawood.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/greenheart.json index fbd441a03..0593d1332 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/zebrawood.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/greenheart.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/zebrawood_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/greenheart_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ipe.json new file mode 100644 index 000000000..6782f8f54 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ipe.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/ipe_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/ipe_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/kapok.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/palm.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/kapok.json index ea7dc789b..39539a19e 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/palm.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/kapok.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/palm_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/palm_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/palm_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/palm_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/palm_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/palm_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/palm_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/palm_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/palm_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/palm_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/palm_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/palm_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/palm_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/palm_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/palm_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/palm_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/kapok_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/kapok_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/larch.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/plum.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/larch.json index 1951b45e4..deb25a698 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/plum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/larch.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/plum_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/plum_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/plum_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/plum_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/plum_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/plum_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/plum_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/plum_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/plum_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/plum_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/plum_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/plum_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/plum_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/plum_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/plum_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/plum_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/larch_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/larch_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/larch_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/larch_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/larch_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/larch_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/larch_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/larch_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/larch_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/larch_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/larch_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/larch_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/larch_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/larch_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/larch_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/larch_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/lime.json similarity index 54% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/ipe.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/lime.json index f5ac0a861..def295913 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/ipe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/lime.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/ipe_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/ipe_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/lime_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/lime_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/lime_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/lime_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/lime_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/lime_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/lime_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/lime_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/lime_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/lime_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/lime_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/lime_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/lime_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/lime_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/lime_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/lime_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahoe.json new file mode 100644 index 000000000..e4a6693ff --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahoe.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahoe_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahogany.json similarity index 51% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/cherry.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahogany.json index 4d730be11..50da0b6b5 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/cherry.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahogany.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cherry_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cherry_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/mahogany_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/maple.json new file mode 100644 index 000000000..9acfbaa36 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/maple.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/maple_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/maple_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/maple_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/maple_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/maple_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/maple_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/maple_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/maple_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/maple_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/maple_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/maple_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/maple_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/maple_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/maple_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/maple_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/maple_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/padauk.json new file mode 100644 index 000000000..ff60610af --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/padauk.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/padauk_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/padauk_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/palm.json new file mode 100644 index 000000000..80c5ff40e --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/palm.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/palm_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/palm_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/palm_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/palm_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/palm_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/palm_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/palm_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/palm_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/palm_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/palm_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/palm_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/palm_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/palm_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/palm_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/palm_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/palm_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/papaya.json new file mode 100644 index 000000000..ddae21386 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/papaya.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/papaya_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/papaya_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/pine.json new file mode 100644 index 000000000..30511a587 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/pine.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/pine_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/pine_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/pine_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/pine_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/pine_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/pine_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/pine_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/pine_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/pine_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/pine_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/pine_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/pine_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/pine_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/pine_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/pine_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/pine_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/plum.json new file mode 100644 index 000000000..c1ef34e3e --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/plum.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/plum_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/plum_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/plum_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/plum_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/plum_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/plum_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/plum_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/plum_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/plum_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/plum_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/plum_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/plum_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/plum_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/plum_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/plum_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/plum_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/poplar.json new file mode 100644 index 000000000..dedcf61e2 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/poplar.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/poplar_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/poplar_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/sequoia.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/acacia.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/sequoia.json index 6eab7da67..f6848aeb9 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/acacia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/sequoia.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/acacia_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/acacia_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/sequoia_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/teak.json similarity index 51% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/teak.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/teak.json index ab3fcd6f1..af12482e9 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/teak.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/teak.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/teak_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/teak_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/teak_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/teak_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/teak_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/teak_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/teak_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/teak_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/teak_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/teak_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/teak_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/teak_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/teak_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/teak_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/teak_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/teak_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/teak_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/teak_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/teak_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/teak_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/teak_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/teak_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/teak_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/teak_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/teak_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/teak_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/teak_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/teak_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/teak_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/teak_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/teak_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/teak_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/walnut.json new file mode 100644 index 000000000..1f23e2783 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/walnut.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/walnut_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/walnut_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/wenge.json new file mode 100644 index 000000000..888561fe7 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/wenge.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/wenge_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/wenge_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/willow.json new file mode 100644 index 000000000..e9b68a2d4 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/willow.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/willow_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/willow_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/willow_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/willow_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/willow_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/willow_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/willow_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/willow_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/willow_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/willow_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/willow_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/willow_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/willow_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/willow_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/willow_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/willow_wall_open", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/zebrawood.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/cocobolo.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/zebrawood.json index 8ebd959fc..5a8b03a0e 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/cocobolo.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/zebrawood.json @@ -1,20 +1,20 @@ { "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/cocobolo_wall_open", "y": 270, "uvlock": true } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate/zebrawood_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/baobab.json deleted file mode 100644 index 5df521cb7..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/baobab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/baobab_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/baobab_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/giganteum.json deleted file mode 100644 index 86a682ec0..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/giganteum.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/giganteum_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/greenheart.json deleted file mode 100644 index 2a44a114a..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/greenheart.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/greenheart_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahoe.json deleted file mode 100644 index 0215a7cec..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahoe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahoe_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahogany.json deleted file mode 100644 index b7236f246..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/mahogany.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/mahogany_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/maple.json deleted file mode 100644 index fd961c16d..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/maple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/maple_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/maple_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/maple_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/maple_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/maple_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/maple_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/maple_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/maple_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/maple_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/maple_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/maple_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/maple_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/maple_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/maple_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/maple_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/maple_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/padauk.json deleted file mode 100644 index 4a9d097df..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/padauk.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/padauk_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/padauk_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/papaya.json deleted file mode 100644 index 8392d0e3c..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/papaya.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/papaya_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/papaya_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/poplar.json deleted file mode 100644 index fff5314a3..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/poplar.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/poplar_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/poplar_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/walnut.json deleted file mode 100644 index 1325c0042..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/walnut.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/walnut_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/walnut_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/wenge.json deleted file mode 100644 index 962a6d39c..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/wenge.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/wenge_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/wenge_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/willow.json deleted file mode 100644 index 8323d3004..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gates/willow.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/willow_closed" }, - "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/willow_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/willow_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gates/willow_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/willow_open" }, - "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/willow_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/willow_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gates/willow_open", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/willow_wall_closed" }, - "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/willow_wall_closed", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/willow_wall_closed", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gates/willow_wall_closed", "y": 270, "uvlock": true }, - "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/willow_wall_open" }, - "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/willow_wall_open", "y": 90, "uvlock": true }, - "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/willow_wall_open", "y": 180, "uvlock": true }, - "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gates/willow_wall_open", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json deleted file mode 100644 index 992bd6b50..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/acacia_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/acacia_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/acacia_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/acacia_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/acacia_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json deleted file mode 100644 index b96b7f880..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/balsa_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/balsa_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/balsa_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/balsa_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/balsa_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json deleted file mode 100644 index 3da3b0037..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/baobab_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/baobab_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/baobab_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/baobab_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/baobab_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json deleted file mode 100644 index ae385c30a..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/cherry_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cherry_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cherry_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cherry_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cherry_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json deleted file mode 100644 index 718da7783..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/chestnut_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json deleted file mode 100644 index c95017741..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/citrus_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/citrus_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/citrus_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/citrus_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/citrus_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json deleted file mode 100644 index 4b1465635..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/cocobolo_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json deleted file mode 100644 index 08e651f24..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/ebony_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ebony_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ebony_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ebony_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ebony_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json deleted file mode 100644 index 9e79f2c2a..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/giganteum_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json deleted file mode 100644 index 6506b06f9..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/greenheart_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json deleted file mode 100644 index 663ddad37..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/ipe_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ipe_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ipe_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ipe_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/ipe_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json deleted file mode 100644 index c6609457e..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/kapok_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/kapok_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/kapok_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/kapok_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/kapok_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json deleted file mode 100644 index 25985118c..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/larch_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/larch_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/larch_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/larch_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/larch_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json deleted file mode 100644 index 2beaa3f53..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/lime_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/lime_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/lime_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/lime_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/lime_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json deleted file mode 100644 index 390327f4b..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/mahoe_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json deleted file mode 100644 index ab6af8574..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/mahogany_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json deleted file mode 100644 index 4896ec320..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/maple_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/maple_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/maple_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/maple_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/maple_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json deleted file mode 100644 index 826fd475b..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/padauk_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/padauk_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/padauk_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/padauk_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/padauk_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json deleted file mode 100644 index fdc0c73be..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/palm_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/palm_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/palm_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/palm_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/palm_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json deleted file mode 100644 index c31b14a88..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/papaya_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/papaya_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/papaya_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/papaya_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/papaya_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json deleted file mode 100644 index 349013c45..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/pine_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/pine_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/pine_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/pine_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/pine_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json deleted file mode 100644 index e32e65be4..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/plum_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/plum_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/plum_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/plum_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/plum_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json deleted file mode 100644 index a779f62b6..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/poplar_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/poplar_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/poplar_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/poplar_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/poplar_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json deleted file mode 100644 index 67a781d43..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/sequoia_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json deleted file mode 100644 index 07fa2ddfb..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/teak_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/teak_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/teak_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/teak_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/teak_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json deleted file mode 100644 index 9cf12d171..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/walnut_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/walnut_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/walnut_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/walnut_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/walnut_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json deleted file mode 100644 index 2edc04c48..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/wenge_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/wenge_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/wenge_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/wenge_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/wenge_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json deleted file mode 100644 index 3be61d1e2..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/willow_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/willow_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/willow_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/willow_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/willow_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json deleted file mode 100644 index 61e8aec08..000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "forestry:arboriculture/fences/zebrawood_post" }}, - { "when": { "north": "true" }, - "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json index 6b4c74e87..f574c5d48 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/acacia" }, - "axis=z": { "model": "forestry:arboriculture/logs/acacia_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/acacia_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/acacia_bark" } + "axis=y": { "model": "forestry:arboriculture/log/acacia" }, + "axis=z": { "model": "forestry:arboriculture/log/acacia_side" }, + "axis=x": { "model": "forestry:arboriculture/log/acacia_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/acacia_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/balsa.json index f2a0c340a..a5bfc8821 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/balsa.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/balsa.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/balsa" }, - "axis=z": { "model": "forestry:arboriculture/logs/balsa_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/balsa_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/balsa_bark" } + "axis=y": { "model": "forestry:arboriculture/log/balsa" }, + "axis=z": { "model": "forestry:arboriculture/log/balsa_side" }, + "axis=x": { "model": "forestry:arboriculture/log/balsa_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/balsa_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/baobab.json index c2273cec7..36df536a2 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/baobab.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/baobab.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/baobab" }, - "axis=z": { "model": "forestry:arboriculture/logs/baobab_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/baobab_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/baobab_bark" } + "axis=y": { "model": "forestry:arboriculture/log/baobab" }, + "axis=z": { "model": "forestry:arboriculture/log/baobab_side" }, + "axis=x": { "model": "forestry:arboriculture/log/baobab_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/baobab_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/cherry.json index bd3dc13b6..0f85dae8b 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/cherry.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/cherry.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/cherry" }, - "axis=z": { "model": "forestry:arboriculture/logs/cherry_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/cherry_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/cherry_bark" } + "axis=y": { "model": "forestry:arboriculture/log/cherry" }, + "axis=z": { "model": "forestry:arboriculture/log/cherry_side" }, + "axis=x": { "model": "forestry:arboriculture/log/cherry_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/cherry_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/chestnut.json index 765355659..be9cfc389 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/chestnut.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/chestnut.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/chestnut" }, - "axis=z": { "model": "forestry:arboriculture/logs/chestnut_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/chestnut_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/chestnut_bark" } + "axis=y": { "model": "forestry:arboriculture/log/chestnut" }, + "axis=z": { "model": "forestry:arboriculture/log/chestnut_side" }, + "axis=x": { "model": "forestry:arboriculture/log/chestnut_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/chestnut_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/citrus.json index bc46c9175..b95457d07 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/citrus.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/citrus.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/citrus" }, - "axis=z": { "model": "forestry:arboriculture/logs/citrus_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/citrus_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/citrus_bark" } + "axis=y": { "model": "forestry:arboriculture/log/citrus" }, + "axis=z": { "model": "forestry:arboriculture/log/citrus_side" }, + "axis=x": { "model": "forestry:arboriculture/log/citrus_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/citrus_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/cocobolo.json index f2401164d..ec0fa57b4 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/cocobolo.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/cocobolo.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/cocobolo" }, - "axis=z": { "model": "forestry:arboriculture/logs/cocobolo_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/cocobolo_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/cocobolo_bark" } + "axis=y": { "model": "forestry:arboriculture/log/cocobolo" }, + "axis=z": { "model": "forestry:arboriculture/log/cocobolo_side" }, + "axis=x": { "model": "forestry:arboriculture/log/cocobolo_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/cocobolo_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/ebony.json index 089308155..d8bf3ae0d 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/ebony.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/ebony.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/ebony" }, - "axis=z": { "model": "forestry:arboriculture/logs/ebony_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/ebony_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/ebony_bark" } + "axis=y": { "model": "forestry:arboriculture/log/ebony" }, + "axis=z": { "model": "forestry:arboriculture/log/ebony_side" }, + "axis=x": { "model": "forestry:arboriculture/log/ebony_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/ebony_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/giganteum.json index cb8b99716..6ca20470b 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/giganteum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/giganteum.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/giganteum" }, - "axis=z": { "model": "forestry:arboriculture/logs/giganteum_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/giganteum_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/giganteum_bark" } + "axis=y": { "model": "forestry:arboriculture/log/giganteum" }, + "axis=z": { "model": "forestry:arboriculture/log/giganteum_side" }, + "axis=x": { "model": "forestry:arboriculture/log/giganteum_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/giganteum_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/greenheart.json index b331a49bb..97a00a897 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/greenheart.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/greenheart.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/greenheart" }, - "axis=z": { "model": "forestry:arboriculture/logs/greenheart_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/greenheart_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/greenheart_bark" } + "axis=y": { "model": "forestry:arboriculture/log/greenheart" }, + "axis=z": { "model": "forestry:arboriculture/log/greenheart_side" }, + "axis=x": { "model": "forestry:arboriculture/log/greenheart_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/greenheart_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/ipe.json index 838c8fe0a..4bd4e68b0 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/ipe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/ipe.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/ipe" }, - "axis=z": { "model": "forestry:arboriculture/logs/ipe_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/ipe_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/ipe_bark" } + "axis=y": { "model": "forestry:arboriculture/log/ipe" }, + "axis=z": { "model": "forestry:arboriculture/log/ipe_side" }, + "axis=x": { "model": "forestry:arboriculture/log/ipe_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/ipe_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/kapok.json index 8018597cc..712c741c2 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/kapok.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/kapok.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/kapok" }, - "axis=z": { "model": "forestry:arboriculture/logs/kapok_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/kapok_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/kapok_bark" } + "axis=y": { "model": "forestry:arboriculture/log/kapok" }, + "axis=z": { "model": "forestry:arboriculture/log/kapok_side" }, + "axis=x": { "model": "forestry:arboriculture/log/kapok_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/kapok_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/larch.json index 4a8f26431..653667762 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/larch.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/larch.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/larch" }, - "axis=z": { "model": "forestry:arboriculture/logs/larch_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/larch_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/larch_bark" } + "axis=y": { "model": "forestry:arboriculture/log/larch" }, + "axis=z": { "model": "forestry:arboriculture/log/larch_side" }, + "axis=x": { "model": "forestry:arboriculture/log/larch_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/larch_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/lime.json index 9de5b2ba5..98641cf9c 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/lime.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/lime.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/lime" }, - "axis=z": { "model": "forestry:arboriculture/logs/lime_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/lime_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/lime_bark" } + "axis=y": { "model": "forestry:arboriculture/log/lime" }, + "axis=z": { "model": "forestry:arboriculture/log/lime_side" }, + "axis=x": { "model": "forestry:arboriculture/log/lime_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/lime_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahoe.json index 0fae06fd8..88f597681 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahoe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahoe.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/mahoe" }, - "axis=z": { "model": "forestry:arboriculture/logs/mahoe_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/mahoe_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/mahoe_bark" } + "axis=y": { "model": "forestry:arboriculture/log/mahoe" }, + "axis=z": { "model": "forestry:arboriculture/log/mahoe_side" }, + "axis=x": { "model": "forestry:arboriculture/log/mahoe_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/mahoe_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahogany.json index 1654b8347..63d136a3e 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahogany.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahogany.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/mahogany" }, - "axis=z": { "model": "forestry:arboriculture/logs/mahogany_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/mahogany_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/mahogany_bark" } + "axis=y": { "model": "forestry:arboriculture/log/mahogany" }, + "axis=z": { "model": "forestry:arboriculture/log/mahogany_side" }, + "axis=x": { "model": "forestry:arboriculture/log/mahogany_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/mahogany_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/maple.json index 56ef38096..96bdd2abd 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/maple.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/maple.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/maple" }, - "axis=z": { "model": "forestry:arboriculture/logs/maple_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/maple_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/maple_bark" } + "axis=y": { "model": "forestry:arboriculture/log/maple" }, + "axis=z": { "model": "forestry:arboriculture/log/maple_side" }, + "axis=x": { "model": "forestry:arboriculture/log/maple_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/maple_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/padauk.json index f2798a36e..fc5094d32 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/padauk.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/padauk.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/padauk" }, - "axis=z": { "model": "forestry:arboriculture/logs/padauk_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/padauk_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/padauk_bark" } + "axis=y": { "model": "forestry:arboriculture/log/padauk" }, + "axis=z": { "model": "forestry:arboriculture/log/padauk_side" }, + "axis=x": { "model": "forestry:arboriculture/log/padauk_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/padauk_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/palm.json index 731ac08dc..045197d80 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/palm.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/palm.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/palm" }, - "axis=z": { "model": "forestry:arboriculture/logs/palm_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/palm_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/palm_bark" } + "axis=y": { "model": "forestry:arboriculture/log/palm" }, + "axis=z": { "model": "forestry:arboriculture/log/palm_side" }, + "axis=x": { "model": "forestry:arboriculture/log/palm_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/palm_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/papaya.json index 4aa1e0f9d..17db15064 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/papaya.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/papaya.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/papaya" }, - "axis=z": { "model": "forestry:arboriculture/logs/papaya_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/papaya_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/papaya_bark" } + "axis=y": { "model": "forestry:arboriculture/log/papaya" }, + "axis=z": { "model": "forestry:arboriculture/log/papaya_side" }, + "axis=x": { "model": "forestry:arboriculture/log/papaya_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/papaya_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/pine.json index 3fa9df154..90af4fb06 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/pine.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/pine.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/pine" }, - "axis=z": { "model": "forestry:arboriculture/logs/pine_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/pine_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/pine_bark" } + "axis=y": { "model": "forestry:arboriculture/log/pine" }, + "axis=z": { "model": "forestry:arboriculture/log/pine_side" }, + "axis=x": { "model": "forestry:arboriculture/log/pine_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/pine_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/plum.json index 11a527f05..4a5e47e89 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/plum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/plum.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/plum" }, - "axis=z": { "model": "forestry:arboriculture/logs/plum_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/plum_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/plum_bark" } + "axis=y": { "model": "forestry:arboriculture/log/plum" }, + "axis=z": { "model": "forestry:arboriculture/log/plum_side" }, + "axis=x": { "model": "forestry:arboriculture/log/plum_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/plum_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/poplar.json index 61bc7e04f..60900c066 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/poplar.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/poplar.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/poplar" }, - "axis=z": { "model": "forestry:arboriculture/logs/poplar_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/poplar_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/poplar_bark" } + "axis=y": { "model": "forestry:arboriculture/log/poplar" }, + "axis=z": { "model": "forestry:arboriculture/log/poplar_side" }, + "axis=x": { "model": "forestry:arboriculture/log/poplar_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/poplar_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/sequoia.json index ea648519f..a567b17da 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/sequoia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/sequoia.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/sequoia" }, - "axis=z": { "model": "forestry:arboriculture/logs/sequoia_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/sequoia_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/sequoia_bark" } + "axis=y": { "model": "forestry:arboriculture/log/sequoia" }, + "axis=z": { "model": "forestry:arboriculture/log/sequoia_side" }, + "axis=x": { "model": "forestry:arboriculture/log/sequoia_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/sequoia_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/teak.json index 9c99a6ca4..c09255cd2 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/teak.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/teak.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/teak" }, - "axis=z": { "model": "forestry:arboriculture/logs/teak_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/teak_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/teak_bark" } + "axis=y": { "model": "forestry:arboriculture/log/teak" }, + "axis=z": { "model": "forestry:arboriculture/log/teak_side" }, + "axis=x": { "model": "forestry:arboriculture/log/teak_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/teak_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/walnut.json index d8201bf9a..8b12229bb 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/walnut.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/walnut.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/walnut" }, - "axis=z": { "model": "forestry:arboriculture/logs/walnut_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/walnut_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/walnut_bark" } + "axis=y": { "model": "forestry:arboriculture/log/walnut" }, + "axis=z": { "model": "forestry:arboriculture/log/walnut_side" }, + "axis=x": { "model": "forestry:arboriculture/log/walnut_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/walnut_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/wenge.json index 3ae6ea977..116fe23dc 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/wenge.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/wenge.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/wenge" }, - "axis=z": { "model": "forestry:arboriculture/logs/wenge_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/wenge_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/wenge_bark" } + "axis=y": { "model": "forestry:arboriculture/log/wenge" }, + "axis=z": { "model": "forestry:arboriculture/log/wenge_side" }, + "axis=x": { "model": "forestry:arboriculture/log/wenge_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/wenge_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/willow.json index 5288e1240..94db074e0 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/willow.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/willow.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/willow" }, - "axis=z": { "model": "forestry:arboriculture/logs/willow_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/willow_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/willow_bark" } + "axis=y": { "model": "forestry:arboriculture/log/willow" }, + "axis=z": { "model": "forestry:arboriculture/log/willow_side" }, + "axis=x": { "model": "forestry:arboriculture/log/willow_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/willow_bark" } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/zebrawood.json index 45278d963..388927240 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/zebrawood.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log/zebrawood.json @@ -1,8 +1,8 @@ { "variants": { - "axis=y": { "model": "forestry:arboriculture/logs/zebrawood" }, - "axis=z": { "model": "forestry:arboriculture/logs/zebrawood_side" }, - "axis=x": { "model": "forestry:arboriculture/logs/zebrawood_side", "y": 90 }, - "axis=none": { "model": "forestry:arboriculture/logs/zebrawood_bark" } + "axis=y": { "model": "forestry:arboriculture/log/zebrawood" }, + "axis=z": { "model": "forestry:arboriculture/log/zebrawood_side" }, + "axis=x": { "model": "forestry:arboriculture/log/zebrawood_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log/zebrawood_bark" } } } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/acacia_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/balsa_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/baobab_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cherry_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/chestnut_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/citrus_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/cocobolo_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ebony_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/giganteum_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/greenheart_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/ipe_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/kapok_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/larch_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/lime_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahoe_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/mahogany_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/maple_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/padauk_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/palm_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/papaya_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/pine_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/plum_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/poplar_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/sequoia_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/teak_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/walnut_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/wenge_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/willow_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top_rh.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/doors/zebrawood_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top_rh.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_post.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_post.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/acacia_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/balsa_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/baobab_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cherry_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/chestnut_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/citrus_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/cocobolo_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ebony_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/giganteum_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/greenheart_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/ipe_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/kapok_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/larch_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/lime_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahoe_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/mahogany_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/maple_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/padauk_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/palm_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/papaya_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/pine_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/plum_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/poplar_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/sequoia_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/teak_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/walnut_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/wenge_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/willow_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_open.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gates/zebrawood_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_open.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/acacia.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/acacia.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/acacia_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/balsa.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/balsa_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/baobab.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/baobab_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/cherry.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/cherry_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/chestnut_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/citrus.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/citrus_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/cocobolo_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/ebony.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/ebony_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/giganteum_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/greenheart_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/ipe.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/ipe_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/kapok.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/kapok_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/larch.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/larch.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/larch.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/larch_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/larch_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/larch_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/lime.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/lime.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/lime.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/lime_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/lime_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/lime_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/mahoe_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/mahogany_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/maple.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/maple.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/maple.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/maple_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/maple_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/maple_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/padauk.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/padauk_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/palm.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/palm.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/palm.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/palm_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/palm_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/palm_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/papaya.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/papaya_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/pine.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/pine.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/pine.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/pine_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/pine_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/pine_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/plum.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/plum.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/plum.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/plum_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/plum_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/plum_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/poplar.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/poplar_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/sequoia_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/teak.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/teak.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/teak.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/teak_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/teak_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/teak_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/walnut.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/walnut_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/wenge.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/wenge_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/willow.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/willow.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/willow.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/willow_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/willow_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/willow_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/logs/zebrawood_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_side.json diff --git a/src/main/resources/assets/forestry/models/item/doors/acacia.json b/src/main/resources/assets/forestry/models/item/door/acacia.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/acacia.json rename to src/main/resources/assets/forestry/models/item/door/acacia.json diff --git a/src/main/resources/assets/forestry/models/item/doors/balsa.json b/src/main/resources/assets/forestry/models/item/door/balsa.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/balsa.json rename to src/main/resources/assets/forestry/models/item/door/balsa.json diff --git a/src/main/resources/assets/forestry/models/item/doors/baobab.json b/src/main/resources/assets/forestry/models/item/door/baobab.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/baobab.json rename to src/main/resources/assets/forestry/models/item/door/baobab.json diff --git a/src/main/resources/assets/forestry/models/item/doors/cherry.json b/src/main/resources/assets/forestry/models/item/door/cherry.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/cherry.json rename to src/main/resources/assets/forestry/models/item/door/cherry.json diff --git a/src/main/resources/assets/forestry/models/item/doors/chestnut.json b/src/main/resources/assets/forestry/models/item/door/chestnut.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/chestnut.json rename to src/main/resources/assets/forestry/models/item/door/chestnut.json diff --git a/src/main/resources/assets/forestry/models/item/doors/citrus.json b/src/main/resources/assets/forestry/models/item/door/citrus.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/citrus.json rename to src/main/resources/assets/forestry/models/item/door/citrus.json diff --git a/src/main/resources/assets/forestry/models/item/doors/cocobolo.json b/src/main/resources/assets/forestry/models/item/door/cocobolo.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/cocobolo.json rename to src/main/resources/assets/forestry/models/item/door/cocobolo.json diff --git a/src/main/resources/assets/forestry/models/item/doors/ebony.json b/src/main/resources/assets/forestry/models/item/door/ebony.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/ebony.json rename to src/main/resources/assets/forestry/models/item/door/ebony.json diff --git a/src/main/resources/assets/forestry/models/item/doors/giganteum.json b/src/main/resources/assets/forestry/models/item/door/giganteum.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/giganteum.json rename to src/main/resources/assets/forestry/models/item/door/giganteum.json diff --git a/src/main/resources/assets/forestry/models/item/doors/greenheart.json b/src/main/resources/assets/forestry/models/item/door/greenheart.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/greenheart.json rename to src/main/resources/assets/forestry/models/item/door/greenheart.json diff --git a/src/main/resources/assets/forestry/models/item/doors/ipe.json b/src/main/resources/assets/forestry/models/item/door/ipe.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/ipe.json rename to src/main/resources/assets/forestry/models/item/door/ipe.json diff --git a/src/main/resources/assets/forestry/models/item/doors/kapok.json b/src/main/resources/assets/forestry/models/item/door/kapok.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/kapok.json rename to src/main/resources/assets/forestry/models/item/door/kapok.json diff --git a/src/main/resources/assets/forestry/models/item/doors/larch.json b/src/main/resources/assets/forestry/models/item/door/larch.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/larch.json rename to src/main/resources/assets/forestry/models/item/door/larch.json diff --git a/src/main/resources/assets/forestry/models/item/doors/lime.json b/src/main/resources/assets/forestry/models/item/door/lime.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/lime.json rename to src/main/resources/assets/forestry/models/item/door/lime.json diff --git a/src/main/resources/assets/forestry/models/item/doors/mahoe.json b/src/main/resources/assets/forestry/models/item/door/mahoe.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/mahoe.json rename to src/main/resources/assets/forestry/models/item/door/mahoe.json diff --git a/src/main/resources/assets/forestry/models/item/doors/mahogany.json b/src/main/resources/assets/forestry/models/item/door/mahogany.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/mahogany.json rename to src/main/resources/assets/forestry/models/item/door/mahogany.json diff --git a/src/main/resources/assets/forestry/models/item/doors/maple.json b/src/main/resources/assets/forestry/models/item/door/maple.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/maple.json rename to src/main/resources/assets/forestry/models/item/door/maple.json diff --git a/src/main/resources/assets/forestry/models/item/doors/padauk.json b/src/main/resources/assets/forestry/models/item/door/padauk.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/padauk.json rename to src/main/resources/assets/forestry/models/item/door/padauk.json diff --git a/src/main/resources/assets/forestry/models/item/doors/palm.json b/src/main/resources/assets/forestry/models/item/door/palm.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/palm.json rename to src/main/resources/assets/forestry/models/item/door/palm.json diff --git a/src/main/resources/assets/forestry/models/item/doors/papaya.json b/src/main/resources/assets/forestry/models/item/door/papaya.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/papaya.json rename to src/main/resources/assets/forestry/models/item/door/papaya.json diff --git a/src/main/resources/assets/forestry/models/item/doors/pine.json b/src/main/resources/assets/forestry/models/item/door/pine.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/pine.json rename to src/main/resources/assets/forestry/models/item/door/pine.json diff --git a/src/main/resources/assets/forestry/models/item/doors/plum.json b/src/main/resources/assets/forestry/models/item/door/plum.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/plum.json rename to src/main/resources/assets/forestry/models/item/door/plum.json diff --git a/src/main/resources/assets/forestry/models/item/doors/poplar.json b/src/main/resources/assets/forestry/models/item/door/poplar.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/poplar.json rename to src/main/resources/assets/forestry/models/item/door/poplar.json diff --git a/src/main/resources/assets/forestry/models/item/doors/sequoia.json b/src/main/resources/assets/forestry/models/item/door/sequoia.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/sequoia.json rename to src/main/resources/assets/forestry/models/item/door/sequoia.json diff --git a/src/main/resources/assets/forestry/models/item/doors/teak.json b/src/main/resources/assets/forestry/models/item/door/teak.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/teak.json rename to src/main/resources/assets/forestry/models/item/door/teak.json diff --git a/src/main/resources/assets/forestry/models/item/doors/walnut.json b/src/main/resources/assets/forestry/models/item/door/walnut.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/walnut.json rename to src/main/resources/assets/forestry/models/item/door/walnut.json diff --git a/src/main/resources/assets/forestry/models/item/doors/wenge.json b/src/main/resources/assets/forestry/models/item/door/wenge.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/wenge.json rename to src/main/resources/assets/forestry/models/item/door/wenge.json diff --git a/src/main/resources/assets/forestry/models/item/doors/willow.json b/src/main/resources/assets/forestry/models/item/door/willow.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/willow.json rename to src/main/resources/assets/forestry/models/item/door/willow.json diff --git a/src/main/resources/assets/forestry/models/item/doors/zebrawood.json b/src/main/resources/assets/forestry/models/item/door/zebrawood.json similarity index 100% rename from src/main/resources/assets/forestry/models/item/doors/zebrawood.json rename to src/main/resources/assets/forestry/models/item/door/zebrawood.json diff --git a/src/main/resources/assets/forestry/models/item/fence/acacia.json b/src/main/resources/assets/forestry/models/item/fence/acacia.json new file mode 100644 index 000000000..aee478b71 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/acacia.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/acacia_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/balsa.json b/src/main/resources/assets/forestry/models/item/fence/balsa.json new file mode 100644 index 000000000..c808efda0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/balsa.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/balsa_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/baobab.json b/src/main/resources/assets/forestry/models/item/fence/baobab.json new file mode 100644 index 000000000..748068929 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/baobab.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/baobab_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/cherry.json b/src/main/resources/assets/forestry/models/item/fence/cherry.json new file mode 100644 index 000000000..5439991b1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/cherry.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/cherry_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/chestnut.json b/src/main/resources/assets/forestry/models/item/fence/chestnut.json new file mode 100644 index 000000000..9f74fea56 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/chestnut.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/chestnut_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/citrus.json b/src/main/resources/assets/forestry/models/item/fence/citrus.json new file mode 100644 index 000000000..99a92fe93 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/citrus.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/citrus_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/cocobolo.json b/src/main/resources/assets/forestry/models/item/fence/cocobolo.json new file mode 100644 index 000000000..b3751174a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/cocobolo.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/cocobolo_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/ebony.json b/src/main/resources/assets/forestry/models/item/fence/ebony.json new file mode 100644 index 000000000..93769720d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/ebony.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/ebony_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/giganteum.json b/src/main/resources/assets/forestry/models/item/fence/giganteum.json new file mode 100644 index 000000000..fd0c3a3f6 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/giganteum.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/giganteum_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/greenheart.json b/src/main/resources/assets/forestry/models/item/fence/greenheart.json new file mode 100644 index 000000000..73f1dfd15 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/greenheart.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/greenheart_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/ipe.json b/src/main/resources/assets/forestry/models/item/fence/ipe.json new file mode 100644 index 000000000..b4a2ef581 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/ipe.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/ipe_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/kapok.json b/src/main/resources/assets/forestry/models/item/fence/kapok.json new file mode 100644 index 000000000..40a509e77 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/kapok.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/kapok_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/larch.json b/src/main/resources/assets/forestry/models/item/fence/larch.json new file mode 100644 index 000000000..88b8206e7 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/larch.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/larch_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/lime.json b/src/main/resources/assets/forestry/models/item/fence/lime.json new file mode 100644 index 000000000..f740a5b5d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/lime.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/lime_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/mahoe.json b/src/main/resources/assets/forestry/models/item/fence/mahoe.json new file mode 100644 index 000000000..e8c1ab5ad --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/mahoe.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/mahoe_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/mahogany.json b/src/main/resources/assets/forestry/models/item/fence/mahogany.json new file mode 100644 index 000000000..ff50573af --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/mahogany.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/mahogany_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/maple.json b/src/main/resources/assets/forestry/models/item/fence/maple.json new file mode 100644 index 000000000..06c0e9c72 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/maple.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/maple_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/padauk.json b/src/main/resources/assets/forestry/models/item/fence/padauk.json new file mode 100644 index 000000000..258cc1392 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/padauk.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/padauk_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/palm.json b/src/main/resources/assets/forestry/models/item/fence/palm.json new file mode 100644 index 000000000..1f81aba71 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/palm.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/palm_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/papaya.json b/src/main/resources/assets/forestry/models/item/fence/papaya.json new file mode 100644 index 000000000..51ae5ba13 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/papaya.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/papaya_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/pine.json b/src/main/resources/assets/forestry/models/item/fence/pine.json new file mode 100644 index 000000000..3feb0f15c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/pine.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/pine_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/plum.json b/src/main/resources/assets/forestry/models/item/fence/plum.json new file mode 100644 index 000000000..559a1c754 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/plum.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/plum_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/poplar.json b/src/main/resources/assets/forestry/models/item/fence/poplar.json new file mode 100644 index 000000000..bcd913e21 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/poplar.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/poplar_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/sequoia.json b/src/main/resources/assets/forestry/models/item/fence/sequoia.json new file mode 100644 index 000000000..66f623bce --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/sequoia.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/sequoia_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/teak.json b/src/main/resources/assets/forestry/models/item/fence/teak.json new file mode 100644 index 000000000..cd6f0e8e1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/teak.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/teak_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/walnut.json b/src/main/resources/assets/forestry/models/item/fence/walnut.json new file mode 100644 index 000000000..5c42fd547 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/walnut.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/walnut_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/wenge.json b/src/main/resources/assets/forestry/models/item/fence/wenge.json new file mode 100644 index 000000000..21c21a514 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/wenge.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/wenge_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/willow.json b/src/main/resources/assets/forestry/models/item/fence/willow.json new file mode 100644 index 000000000..b7bd2c83c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/willow.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/willow_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/zebrawood.json b/src/main/resources/assets/forestry/models/item/fence/zebrawood.json new file mode 100644 index 000000000..61d43fbe0 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence/zebrawood.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence/zebrawood_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/kapok.json b/src/main/resources/assets/forestry/models/item/fence_gate/acacia.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/kapok.json rename to src/main/resources/assets/forestry/models/item/fence_gate/acacia.json index f60e77cbd..830a0de64 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/kapok.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/acacia.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/kapok_closed", + "parent": "forestry:block/arboriculture/fence_gate/acacia_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/lime.json b/src/main/resources/assets/forestry/models/item/fence_gate/balsa.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/lime.json rename to src/main/resources/assets/forestry/models/item/fence_gate/balsa.json index 1c67b19b0..db6ee982a 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/lime.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/balsa.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/lime_closed", + "parent": "forestry:block/arboriculture/fence_gate/balsa_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/ebony.json b/src/main/resources/assets/forestry/models/item/fence_gate/baobab.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/ebony.json rename to src/main/resources/assets/forestry/models/item/fence_gate/baobab.json index 4476a1f97..995e4056b 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/ebony.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/baobab.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/ebony_closed", + "parent": "forestry:block/arboriculture/fence_gate/baobab_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/balsa.json b/src/main/resources/assets/forestry/models/item/fence_gate/cherry.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/balsa.json rename to src/main/resources/assets/forestry/models/item/fence_gate/cherry.json index b0206a7a9..9a9e363b9 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/balsa.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/cherry.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/balsa_closed", + "parent": "forestry:block/arboriculture/fence_gate/cherry_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/sequoia.json b/src/main/resources/assets/forestry/models/item/fence_gate/chestnut.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/sequoia.json rename to src/main/resources/assets/forestry/models/item/fence_gate/chestnut.json index 2c97fc606..00b9aac19 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/sequoia.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/chestnut.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/sequoia_closed", + "parent": "forestry:block/arboriculture/fence_gate/chestnut_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/larch.json b/src/main/resources/assets/forestry/models/item/fence_gate/citrus.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/larch.json rename to src/main/resources/assets/forestry/models/item/fence_gate/citrus.json index 8e16a66cb..bec3f2958 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/larch.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/citrus.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/larch_closed", + "parent": "forestry:block/arboriculture/fence_gate/citrus_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/cherry.json b/src/main/resources/assets/forestry/models/item/fence_gate/cocobolo.json similarity index 87% rename from src/main/resources/assets/forestry/models/item/fence_gates/cherry.json rename to src/main/resources/assets/forestry/models/item/fence_gate/cocobolo.json index 1791909b0..2f7d79edb 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/cherry.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/cocobolo.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/cherry_closed", + "parent": "forestry:block/arboriculture/fence_gate/cocobolo_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/pine.json b/src/main/resources/assets/forestry/models/item/fence_gate/ebony.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/pine.json rename to src/main/resources/assets/forestry/models/item/fence_gate/ebony.json index abf687469..9a39fa830 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/pine.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/ebony.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/pine_closed", + "parent": "forestry:block/arboriculture/fence_gate/ebony_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/chestnut.json b/src/main/resources/assets/forestry/models/item/fence_gate/giganteum.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/chestnut.json rename to src/main/resources/assets/forestry/models/item/fence_gate/giganteum.json index 3bb3edc99..483504cd9 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/chestnut.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/giganteum.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/chestnut_closed", + "parent": "forestry:block/arboriculture/fence_gate/giganteum_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/giganteum.json b/src/main/resources/assets/forestry/models/item/fence_gate/greenheart.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/giganteum.json rename to src/main/resources/assets/forestry/models/item/fence_gate/greenheart.json index 1539c9e41..47c92a1f3 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/giganteum.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/greenheart.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/giganteum_closed", + "parent": "forestry:block/arboriculture/fence_gate/greenheart_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/ipe.json b/src/main/resources/assets/forestry/models/item/fence_gate/ipe.json new file mode 100644 index 000000000..fae3e6e21 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/ipe.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/ipe_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/plum.json b/src/main/resources/assets/forestry/models/item/fence_gate/kapok.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/plum.json rename to src/main/resources/assets/forestry/models/item/fence_gate/kapok.json index b724b70bd..851f30bc8 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/plum.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/kapok.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/plum_closed", + "parent": "forestry:block/arboriculture/fence_gate/kapok_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/palm.json b/src/main/resources/assets/forestry/models/item/fence_gate/larch.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/palm.json rename to src/main/resources/assets/forestry/models/item/fence_gate/larch.json index b9e46a1c1..ba1a78b65 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/palm.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/larch.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/palm_closed", + "parent": "forestry:block/arboriculture/fence_gate/larch_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/ipe.json b/src/main/resources/assets/forestry/models/item/fence_gate/lime.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/ipe.json rename to src/main/resources/assets/forestry/models/item/fence_gate/lime.json index 824de81a3..f46790781 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/ipe.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/lime.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/ipe_closed", + "parent": "forestry:block/arboriculture/fence_gate/lime_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json b/src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json new file mode 100644 index 000000000..c0c4e361c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/mahoe_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/baobab.json b/src/main/resources/assets/forestry/models/item/fence_gate/mahogany.json similarity index 87% rename from src/main/resources/assets/forestry/models/item/fence_gates/baobab.json rename to src/main/resources/assets/forestry/models/item/fence_gate/mahogany.json index 3c7da3363..ac16925c7 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/baobab.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/mahogany.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/baobab_closed", + "parent": "forestry:block/arboriculture/fence_gate/mahogany_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/maple.json b/src/main/resources/assets/forestry/models/item/fence_gate/maple.json new file mode 100644 index 000000000..e5177a951 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/maple.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/maple_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/padauk.json b/src/main/resources/assets/forestry/models/item/fence_gate/padauk.json new file mode 100644 index 000000000..a458d4e88 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/padauk.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/padauk_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/palm.json b/src/main/resources/assets/forestry/models/item/fence_gate/palm.json new file mode 100644 index 000000000..a3bf590ca --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/palm.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/palm_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/papaya.json b/src/main/resources/assets/forestry/models/item/fence_gate/papaya.json new file mode 100644 index 000000000..89cae7d43 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/papaya.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/papaya_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/pine.json b/src/main/resources/assets/forestry/models/item/fence_gate/pine.json new file mode 100644 index 000000000..a781a8e7d --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/pine.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/pine_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/plum.json b/src/main/resources/assets/forestry/models/item/fence_gate/plum.json new file mode 100644 index 000000000..ada6a4c5c --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/plum.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/plum_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/poplar.json b/src/main/resources/assets/forestry/models/item/fence_gate/poplar.json new file mode 100644 index 000000000..697ff4f81 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/poplar.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/poplar_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/acacia.json b/src/main/resources/assets/forestry/models/item/fence_gate/sequoia.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/acacia.json rename to src/main/resources/assets/forestry/models/item/fence_gate/sequoia.json index 01741d2ae..29d19169c 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/acacia.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/sequoia.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/acacia_closed", + "parent": "forestry:block/arboriculture/fence_gate/sequoia_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/teak.json b/src/main/resources/assets/forestry/models/item/fence_gate/teak.json similarity index 87% rename from src/main/resources/assets/forestry/models/item/fence_gates/teak.json rename to src/main/resources/assets/forestry/models/item/fence_gate/teak.json index 8883b6e66..adc09eba1 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/teak.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/teak.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/teak_closed", + "parent": "forestry:block/arboriculture/fence_gate/teak_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/walnut.json b/src/main/resources/assets/forestry/models/item/fence_gate/walnut.json new file mode 100644 index 000000000..0030754d1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/walnut.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/walnut_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/wenge.json b/src/main/resources/assets/forestry/models/item/fence_gate/wenge.json new file mode 100644 index 000000000..5826984f1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/wenge.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/wenge_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/willow.json b/src/main/resources/assets/forestry/models/item/fence_gate/willow.json new file mode 100644 index 000000000..76c93044e --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence_gate/willow.json @@ -0,0 +1,39 @@ +{ + "parent": "forestry:block/arboriculture/fence_gate/willow_closed", + "display": { + "firstperson": { + "rotation": [ + 0.0, + 90.0, + 0.0 + ], + "translation": [ + 0.0, + 0.0, + 0.0 + ], + "scale": [ + 1.0, + 1.0, + 1.0 + ] + }, + "thirdperson": { + "rotation": [ + 0.0, + -90.0, + 170.0 + ], + "translation": [ + 0.0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/cocobolo.json b/src/main/resources/assets/forestry/models/item/fence_gate/zebrawood.json similarity index 88% rename from src/main/resources/assets/forestry/models/item/fence_gates/cocobolo.json rename to src/main/resources/assets/forestry/models/item/fence_gate/zebrawood.json index 533707e3a..786f4ea59 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gates/cocobolo.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate/zebrawood.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gates/cocobolo_closed", + "parent": "forestry:block/arboriculture/fence_gate/zebrawood_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/citrus.json b/src/main/resources/assets/forestry/models/item/fence_gates/citrus.json deleted file mode 100644 index 36a8286bf..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/citrus.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/citrus_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/greenheart.json b/src/main/resources/assets/forestry/models/item/fence_gates/greenheart.json deleted file mode 100644 index 8f323e2a8..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/greenheart.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/greenheart_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/mahoe.json b/src/main/resources/assets/forestry/models/item/fence_gates/mahoe.json deleted file mode 100644 index 3dd8ecfd0..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/mahoe.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/mahoe_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/mahogany.json b/src/main/resources/assets/forestry/models/item/fence_gates/mahogany.json deleted file mode 100644 index a3e602bfa..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/mahogany.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/mahogany_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/maple.json b/src/main/resources/assets/forestry/models/item/fence_gates/maple.json deleted file mode 100644 index 99cbbb225..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/maple.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/maple_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/padauk.json b/src/main/resources/assets/forestry/models/item/fence_gates/padauk.json deleted file mode 100644 index f61d80790..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/padauk.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/padauk_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/papaya.json b/src/main/resources/assets/forestry/models/item/fence_gates/papaya.json deleted file mode 100644 index 9f10d53e2..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/papaya.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/papaya_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/poplar.json b/src/main/resources/assets/forestry/models/item/fence_gates/poplar.json deleted file mode 100644 index c8a529c92..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/poplar.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/poplar_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/walnut.json b/src/main/resources/assets/forestry/models/item/fence_gates/walnut.json deleted file mode 100644 index 1705c6544..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/walnut.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/walnut_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/wenge.json b/src/main/resources/assets/forestry/models/item/fence_gates/wenge.json deleted file mode 100644 index c48c86c00..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/wenge.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/wenge_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/willow.json b/src/main/resources/assets/forestry/models/item/fence_gates/willow.json deleted file mode 100644 index 5b3cf85d6..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/willow.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/willow_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fence_gates/zebrawood.json b/src/main/resources/assets/forestry/models/item/fence_gates/zebrawood.json deleted file mode 100644 index 70b457f24..000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gates/zebrawood.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gates/zebrawood_closed", - "display": { - "firstperson": { - "rotation": [ - 0.0, - 90.0, - 0.0 - ], - "translation": [ - 0.0, - 0.0, - 0.0 - ], - "scale": [ - 1.0, - 1.0, - 1.0 - ] - }, - "thirdperson": { - "rotation": [ - 0.0, - -90.0, - 170.0 - ], - "translation": [ - 0.0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/fences/acacia.json b/src/main/resources/assets/forestry/models/item/fences/acacia.json deleted file mode 100644 index bc882e78d..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/acacia.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/acacia_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/balsa.json b/src/main/resources/assets/forestry/models/item/fences/balsa.json deleted file mode 100644 index f487f0e7c..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/balsa.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/balsa_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/baobab.json b/src/main/resources/assets/forestry/models/item/fences/baobab.json deleted file mode 100644 index 1f7db7108..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/baobab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/baobab_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/cherry.json b/src/main/resources/assets/forestry/models/item/fences/cherry.json deleted file mode 100644 index 635e4564a..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/cherry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/cherry_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/chestnut.json b/src/main/resources/assets/forestry/models/item/fences/chestnut.json deleted file mode 100644 index 06baa0eff..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/chestnut.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/chestnut_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/citrus.json b/src/main/resources/assets/forestry/models/item/fences/citrus.json deleted file mode 100644 index c084976f4..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/citrus.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/citrus_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/cocobolo.json b/src/main/resources/assets/forestry/models/item/fences/cocobolo.json deleted file mode 100644 index e0209eb57..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/cocobolo.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/cocobolo_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/ebony.json b/src/main/resources/assets/forestry/models/item/fences/ebony.json deleted file mode 100644 index 6c49f7705..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/ebony.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/ebony_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/giganteum.json b/src/main/resources/assets/forestry/models/item/fences/giganteum.json deleted file mode 100644 index 35850c92d..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/giganteum.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/giganteum_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/greenheart.json b/src/main/resources/assets/forestry/models/item/fences/greenheart.json deleted file mode 100644 index f263098e0..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/greenheart.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/greenheart_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/ipe.json b/src/main/resources/assets/forestry/models/item/fences/ipe.json deleted file mode 100644 index 71f754d7c..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/ipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/ipe_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/kapok.json b/src/main/resources/assets/forestry/models/item/fences/kapok.json deleted file mode 100644 index e24e8bdc1..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/kapok.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/kapok_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/larch.json b/src/main/resources/assets/forestry/models/item/fences/larch.json deleted file mode 100644 index e221086f0..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/larch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/larch_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/lime.json b/src/main/resources/assets/forestry/models/item/fences/lime.json deleted file mode 100644 index de9127e3c..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/lime.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/lime_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/mahoe.json b/src/main/resources/assets/forestry/models/item/fences/mahoe.json deleted file mode 100644 index e4c93a221..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/mahoe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/mahoe_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/mahogany.json b/src/main/resources/assets/forestry/models/item/fences/mahogany.json deleted file mode 100644 index 6a613c962..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/mahogany.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/mahogany_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/maple.json b/src/main/resources/assets/forestry/models/item/fences/maple.json deleted file mode 100644 index 51c634fb4..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/maple.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/maple_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/padauk.json b/src/main/resources/assets/forestry/models/item/fences/padauk.json deleted file mode 100644 index 6c1a3347d..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/padauk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/padauk_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/palm.json b/src/main/resources/assets/forestry/models/item/fences/palm.json deleted file mode 100644 index dc4293671..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/palm.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/palm_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/papaya.json b/src/main/resources/assets/forestry/models/item/fences/papaya.json deleted file mode 100644 index f85d5ce82..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/papaya.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/papaya_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/pine.json b/src/main/resources/assets/forestry/models/item/fences/pine.json deleted file mode 100644 index 9cefec7cf..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/pine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/pine_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/plum.json b/src/main/resources/assets/forestry/models/item/fences/plum.json deleted file mode 100644 index 856101ae9..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/plum.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/plum_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/poplar.json b/src/main/resources/assets/forestry/models/item/fences/poplar.json deleted file mode 100644 index dd6ec4153..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/poplar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/poplar_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/sequoia.json b/src/main/resources/assets/forestry/models/item/fences/sequoia.json deleted file mode 100644 index e0841a922..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/sequoia.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/sequoia_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/teak.json b/src/main/resources/assets/forestry/models/item/fences/teak.json deleted file mode 100644 index 8457a8f0b..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/teak.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/teak_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/walnut.json b/src/main/resources/assets/forestry/models/item/fences/walnut.json deleted file mode 100644 index 8a4f2d82a..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/walnut.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/walnut_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/wenge.json b/src/main/resources/assets/forestry/models/item/fences/wenge.json deleted file mode 100644 index 020e993b6..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/wenge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/wenge_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/willow.json b/src/main/resources/assets/forestry/models/item/fences/willow.json deleted file mode 100644 index 78842dab9..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/willow.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/willow_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fences/zebrawood.json b/src/main/resources/assets/forestry/models/item/fences/zebrawood.json deleted file mode 100644 index 3c9702384..000000000 --- a/src/main/resources/assets/forestry/models/item/fences/zebrawood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fences/zebrawood_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/log/acacia.json b/src/main/resources/assets/forestry/models/item/log/acacia.json index 10e2b97b7..2eb8a32a4 100644 --- a/src/main/resources/assets/forestry/models/item/log/acacia.json +++ b/src/main/resources/assets/forestry/models/item/log/acacia.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/acacia", + "parent": "forestry:block/arboriculture/log/acacia", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/balsa.json b/src/main/resources/assets/forestry/models/item/log/balsa.json index 351c83a1a..17317eb6c 100644 --- a/src/main/resources/assets/forestry/models/item/log/balsa.json +++ b/src/main/resources/assets/forestry/models/item/log/balsa.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/balsa", + "parent": "forestry:block/arboriculture/log/balsa", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/baobab.json b/src/main/resources/assets/forestry/models/item/log/baobab.json index 1ed3f859e..37cdb06de 100644 --- a/src/main/resources/assets/forestry/models/item/log/baobab.json +++ b/src/main/resources/assets/forestry/models/item/log/baobab.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/baobab", + "parent": "forestry:block/arboriculture/log/baobab", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/cherry.json b/src/main/resources/assets/forestry/models/item/log/cherry.json index 37de0cc05..fc0bf6729 100644 --- a/src/main/resources/assets/forestry/models/item/log/cherry.json +++ b/src/main/resources/assets/forestry/models/item/log/cherry.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/cherry", + "parent": "forestry:block/arboriculture/log/cherry", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/chestnut.json b/src/main/resources/assets/forestry/models/item/log/chestnut.json index 7adcf1a9b..1b466f3d9 100644 --- a/src/main/resources/assets/forestry/models/item/log/chestnut.json +++ b/src/main/resources/assets/forestry/models/item/log/chestnut.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/chestnut", + "parent": "forestry:block/arboriculture/log/chestnut", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/citrus.json b/src/main/resources/assets/forestry/models/item/log/citrus.json index c62e6070f..c65f4cabc 100644 --- a/src/main/resources/assets/forestry/models/item/log/citrus.json +++ b/src/main/resources/assets/forestry/models/item/log/citrus.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/citrus", + "parent": "forestry:block/arboriculture/log/citrus", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/cocobolo.json b/src/main/resources/assets/forestry/models/item/log/cocobolo.json index 026634827..38bebd8dc 100644 --- a/src/main/resources/assets/forestry/models/item/log/cocobolo.json +++ b/src/main/resources/assets/forestry/models/item/log/cocobolo.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/cocobolo", + "parent": "forestry:block/arboriculture/log/cocobolo", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/ebony.json b/src/main/resources/assets/forestry/models/item/log/ebony.json index 8481d9986..33d97f7fd 100644 --- a/src/main/resources/assets/forestry/models/item/log/ebony.json +++ b/src/main/resources/assets/forestry/models/item/log/ebony.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/ebony", + "parent": "forestry:block/arboriculture/log/ebony", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/giganteum.json b/src/main/resources/assets/forestry/models/item/log/giganteum.json index aca72bbeb..f87be6421 100644 --- a/src/main/resources/assets/forestry/models/item/log/giganteum.json +++ b/src/main/resources/assets/forestry/models/item/log/giganteum.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/giganteum", + "parent": "forestry:block/arboriculture/log/giganteum", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/greenheart.json b/src/main/resources/assets/forestry/models/item/log/greenheart.json index e034fa1f0..4faee37d1 100644 --- a/src/main/resources/assets/forestry/models/item/log/greenheart.json +++ b/src/main/resources/assets/forestry/models/item/log/greenheart.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/greenheart", + "parent": "forestry:block/arboriculture/log/greenheart", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/ipe.json b/src/main/resources/assets/forestry/models/item/log/ipe.json index 4c887c8bc..ffbbe300c 100644 --- a/src/main/resources/assets/forestry/models/item/log/ipe.json +++ b/src/main/resources/assets/forestry/models/item/log/ipe.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/ipe", + "parent": "forestry:block/arboriculture/log/ipe", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/kapok.json b/src/main/resources/assets/forestry/models/item/log/kapok.json index 42216a485..0397dd408 100644 --- a/src/main/resources/assets/forestry/models/item/log/kapok.json +++ b/src/main/resources/assets/forestry/models/item/log/kapok.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/kapok", + "parent": "forestry:block/arboriculture/log/kapok", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/larch.json b/src/main/resources/assets/forestry/models/item/log/larch.json index 15ba3d72a..c1cc2cfeb 100644 --- a/src/main/resources/assets/forestry/models/item/log/larch.json +++ b/src/main/resources/assets/forestry/models/item/log/larch.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/larch", + "parent": "forestry:block/arboriculture/log/larch", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/lime.json b/src/main/resources/assets/forestry/models/item/log/lime.json index a565bb351..726d07ff9 100644 --- a/src/main/resources/assets/forestry/models/item/log/lime.json +++ b/src/main/resources/assets/forestry/models/item/log/lime.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/lime", + "parent": "forestry:block/arboriculture/log/lime", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/mahoe.json b/src/main/resources/assets/forestry/models/item/log/mahoe.json index 842c686b1..565467b38 100644 --- a/src/main/resources/assets/forestry/models/item/log/mahoe.json +++ b/src/main/resources/assets/forestry/models/item/log/mahoe.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/mahoe", + "parent": "forestry:block/arboriculture/log/mahoe", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/mahogany.json b/src/main/resources/assets/forestry/models/item/log/mahogany.json index 94b6c7dfa..22d86c856 100644 --- a/src/main/resources/assets/forestry/models/item/log/mahogany.json +++ b/src/main/resources/assets/forestry/models/item/log/mahogany.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/mahogany", + "parent": "forestry:block/arboriculture/log/mahogany", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/maple.json b/src/main/resources/assets/forestry/models/item/log/maple.json index 3defe04da..bc84f7e94 100644 --- a/src/main/resources/assets/forestry/models/item/log/maple.json +++ b/src/main/resources/assets/forestry/models/item/log/maple.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/maple", + "parent": "forestry:block/arboriculture/log/maple", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/padauk.json b/src/main/resources/assets/forestry/models/item/log/padauk.json index 9778dfb86..02bfc6d58 100644 --- a/src/main/resources/assets/forestry/models/item/log/padauk.json +++ b/src/main/resources/assets/forestry/models/item/log/padauk.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/padauk", + "parent": "forestry:block/arboriculture/log/padauk", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/palm.json b/src/main/resources/assets/forestry/models/item/log/palm.json index 26f5ad121..907c78268 100644 --- a/src/main/resources/assets/forestry/models/item/log/palm.json +++ b/src/main/resources/assets/forestry/models/item/log/palm.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/palm", + "parent": "forestry:block/arboriculture/log/palm", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/papaya.json b/src/main/resources/assets/forestry/models/item/log/papaya.json index 1ca644e22..68fbae39d 100644 --- a/src/main/resources/assets/forestry/models/item/log/papaya.json +++ b/src/main/resources/assets/forestry/models/item/log/papaya.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/papaya", + "parent": "forestry:block/arboriculture/log/papaya", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/pine.json b/src/main/resources/assets/forestry/models/item/log/pine.json index b338df772..bdd353d8d 100644 --- a/src/main/resources/assets/forestry/models/item/log/pine.json +++ b/src/main/resources/assets/forestry/models/item/log/pine.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/pine", + "parent": "forestry:block/arboriculture/log/pine", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/plum.json b/src/main/resources/assets/forestry/models/item/log/plum.json index e5df74268..3dd17ee49 100644 --- a/src/main/resources/assets/forestry/models/item/log/plum.json +++ b/src/main/resources/assets/forestry/models/item/log/plum.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/plum", + "parent": "forestry:block/arboriculture/log/plum", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/poplar.json b/src/main/resources/assets/forestry/models/item/log/poplar.json index a3d19aa8d..0ba198dd2 100644 --- a/src/main/resources/assets/forestry/models/item/log/poplar.json +++ b/src/main/resources/assets/forestry/models/item/log/poplar.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/poplar", + "parent": "forestry:block/arboriculture/log/poplar", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/sequoia.json b/src/main/resources/assets/forestry/models/item/log/sequoia.json index 9caac2c78..90a3625ee 100644 --- a/src/main/resources/assets/forestry/models/item/log/sequoia.json +++ b/src/main/resources/assets/forestry/models/item/log/sequoia.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/sequoia", + "parent": "forestry:block/arboriculture/log/sequoia", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/teak.json b/src/main/resources/assets/forestry/models/item/log/teak.json index 7b880d54f..1a33d8296 100644 --- a/src/main/resources/assets/forestry/models/item/log/teak.json +++ b/src/main/resources/assets/forestry/models/item/log/teak.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/teak", + "parent": "forestry:block/arboriculture/log/teak", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/walnut.json b/src/main/resources/assets/forestry/models/item/log/walnut.json index 9b4cd8e12..ebb821deb 100644 --- a/src/main/resources/assets/forestry/models/item/log/walnut.json +++ b/src/main/resources/assets/forestry/models/item/log/walnut.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/walnut", + "parent": "forestry:block/arboriculture/log/walnut", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/wenge.json b/src/main/resources/assets/forestry/models/item/log/wenge.json index 115298b42..b8c983d54 100644 --- a/src/main/resources/assets/forestry/models/item/log/wenge.json +++ b/src/main/resources/assets/forestry/models/item/log/wenge.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/wenge", + "parent": "forestry:block/arboriculture/log/wenge", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/willow.json b/src/main/resources/assets/forestry/models/item/log/willow.json index ad6954fc6..903a5d8ca 100644 --- a/src/main/resources/assets/forestry/models/item/log/willow.json +++ b/src/main/resources/assets/forestry/models/item/log/willow.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/willow", + "parent": "forestry:block/arboriculture/log/willow", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/log/zebrawood.json b/src/main/resources/assets/forestry/models/item/log/zebrawood.json index c4c8f9724..448bcc3d9 100644 --- a/src/main/resources/assets/forestry/models/item/log/zebrawood.json +++ b/src/main/resources/assets/forestry/models/item/log/zebrawood.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/logs/zebrawood", + "parent": "forestry:block/arboriculture/log/zebrawood", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ],