From eb63e752003efc06a96b607ae8b19b341abb5c4f Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 12 Aug 2016 06:22:02 +0200 Subject: [PATCH] Add new Wood Model Loader (#1367) --- .../arboriculture/EnumForestryWoodType.java | 25 ++ .../arboriculture/EnumVanillaWoodType.java | 40 +++ .../api/arboriculture/IWoodAccess.java | 4 + .../IWoodItemMeshDefinition.java | 19 ++ .../api/arboriculture/IWoodStateMapper.java | 21 ++ .../forestry/api/arboriculture/IWoodType.java | 10 + .../api/arboriculture/WoodBlockKind.java | 56 +++- .../CamouflageHandlerArbDoor.java | 5 +- .../forestry/arboriculture/IWoodTyped.java | 2 +- .../arboriculture/PluginArboriculture.java | 22 ++ .../forestry/arboriculture/WoodAccess.java | 17 + .../forestry/arboriculture/WoodHelper.java | 18 +- .../blocks/BlockForestryFenceGate.java | 2 +- .../blocks/BlockForestryStairs.java | 2 +- .../blocks/WoodTypeStateMapper.java | 33 +- .../blocks/fence/BlockForestryFence.java | 2 +- .../blocks/log/BlockForestryLog.java | 2 +- .../blocks/planks/BlockForestryPlanks.java | 2 +- .../blocks/slab/BlockForestrySlab.java | 2 +- .../arboriculture/models/ModelWoodPile.java | 4 +- .../arboriculture/models/WoodModelLoader.java | 296 ++++++++++++++++++ .../proxy/ProxyArboriculture.java | 8 +- .../proxy/ProxyArboricultureClient.java | 116 ++++++- .../forestry/core/items/ItemForestryTool.java | 2 - .../{BlankItemModel.java => BlankModel.java} | 4 +- ...ckModelIndex.java => BlockModelEntry.java} | 6 +- .../java/forestry/core/models/ModelCrate.java | 4 +- .../{ModelIndex.java => ModelEntry.java} | 4 +- .../forestry/core/models/ModelManager.java | 20 +- .../core/models/SimpleRetexturedModel.java | 61 ++++ .../forestry/core/models/WoodModelEntry.java | 30 ++ .../core/owner/GameProfileDataSerializer.java | 1 - .../java/forestry/core/proxy/ProxyRender.java | 8 +- .../core/proxy/ProxyRenderClient.java | 12 +- .../java/forestry/energy/EnergyManager.java | 3 +- .../farming/proxy/ProxyFarmingClient.java | 4 +- .../blocks/BlockRegistryGreenhouse.java | 1 - .../proxy/ProxyGreenhouseClient.java | 15 +- .../proxy/ProxyLepidopterologyClient.java | 4 +- .../render/ModelButterflyItem.java | 4 +- .../plugins/compat/ForestryJeiPlugin.java | 1 - .../storage/proxy/ProxyStorageClient.java | 4 +- .../{door/ipe.json => door.json} | 64 ++-- .../arboriculture/door/acacia.json | 36 --- .../blockstates/arboriculture/door/balsa.json | 36 --- .../arboriculture/door/baobab.json | 36 --- .../arboriculture/door/cherry.json | 36 --- .../arboriculture/door/chestnut.json | 36 --- .../arboriculture/door/citrus.json | 36 --- .../arboriculture/door/cocobolo.json | 36 --- .../blockstates/arboriculture/door/ebony.json | 36 --- .../arboriculture/door/giganteum.json | 36 --- .../arboriculture/door/greenheart.json | 36 --- .../blockstates/arboriculture/door/kapok.json | 36 --- .../blockstates/arboriculture/door/larch.json | 36 --- .../blockstates/arboriculture/door/lime.json | 36 --- .../blockstates/arboriculture/door/mahoe.json | 36 --- .../arboriculture/door/mahogany.json | 36 --- .../blockstates/arboriculture/door/maple.json | 36 --- .../arboriculture/door/padauk.json | 36 --- .../blockstates/arboriculture/door/palm.json | 36 --- .../arboriculture/door/papaya.json | 36 --- .../blockstates/arboriculture/door/pine.json | 36 --- .../blockstates/arboriculture/door/plum.json | 36 --- .../arboriculture/door/poplar.json | 36 --- .../arboriculture/door/sequoia.json | 36 --- .../blockstates/arboriculture/door/teak.json | 36 --- .../arboriculture/door/walnut.json | 36 --- .../blockstates/arboriculture/door/wenge.json | 36 --- .../arboriculture/door/willow.json | 36 --- .../arboriculture/door/zebrawood.json | 36 --- .../arboriculture/double_slab.json | 5 + .../arboriculture/double_slab/acacia.json | 5 - .../arboriculture/double_slab/balsa.json | 5 - .../arboriculture/double_slab/baobab.json | 5 - .../arboriculture/double_slab/cherry.json | 5 - .../arboriculture/double_slab/chestnut.json | 5 - .../arboriculture/double_slab/citrus.json | 5 - .../arboriculture/double_slab/cocobolo.json | 5 - .../arboriculture/double_slab/ebony.json | 5 - .../arboriculture/double_slab/giganteum.json | 5 - .../arboriculture/double_slab/greenheart.json | 5 - .../arboriculture/double_slab/ipe.json | 5 - .../arboriculture/double_slab/kapok.json | 5 - .../arboriculture/double_slab/larch.json | 5 - .../arboriculture/double_slab/lime.json | 5 - .../arboriculture/double_slab/mahoe.json | 5 - .../arboriculture/double_slab/mahogany.json | 5 - .../arboriculture/double_slab/maple.json | 5 - .../arboriculture/double_slab/padauk.json | 5 - .../arboriculture/double_slab/palm.json | 5 - .../arboriculture/double_slab/papaya.json | 5 - .../arboriculture/double_slab/pine.json | 5 - .../arboriculture/double_slab/plum.json | 5 - .../arboriculture/double_slab/poplar.json | 5 - .../arboriculture/double_slab/sequoia.json | 5 - .../arboriculture/double_slab/teak.json | 5 - .../arboriculture/double_slab/walnut.json | 5 - .../arboriculture/double_slab/wenge.json | 5 - .../arboriculture/double_slab/willow.json | 5 - .../arboriculture/double_slab/zebrawood.json | 5 - .../blockstates/arboriculture/fence.json | 30 ++ .../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 - .../{fence_gate/ipe.json => fence_gate.json} | 32 +- .../arboriculture/fence_gate/acacia.json | 20 -- .../arboriculture/fence_gate/balsa.json | 20 -- .../arboriculture/fence_gate/baobab.json | 20 -- .../arboriculture/fence_gate/cherry.json | 20 -- .../arboriculture/fence_gate/chestnut.json | 20 -- .../arboriculture/fence_gate/citrus.json | 20 -- .../arboriculture/fence_gate/cocobolo.json | 20 -- .../arboriculture/fence_gate/ebony.json | 20 -- .../arboriculture/fence_gate/giganteum.json | 20 -- .../arboriculture/fence_gate/greenheart.json | 20 -- .../arboriculture/fence_gate/kapok.json | 20 -- .../arboriculture/fence_gate/larch.json | 20 -- .../arboriculture/fence_gate/lime.json | 20 -- .../arboriculture/fence_gate/mahoe.json | 20 -- .../arboriculture/fence_gate/mahogany.json | 20 -- .../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 -- .../arboriculture/fence_gate/sequoia.json | 20 -- .../arboriculture/fence_gate/teak.json | 20 -- .../arboriculture/fence_gate/walnut.json | 20 -- .../arboriculture/fence_gate/wenge.json | 20 -- .../arboriculture/fence_gate/willow.json | 20 -- .../arboriculture/fence_gate/zebrawood.json | 20 -- .../blockstates/arboriculture/log.json | 8 + .../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 - .../blockstates/arboriculture/planks.json | 5 + .../arboriculture/planks/acacia.json | 5 - .../arboriculture/planks/balsa.json | 5 - .../arboriculture/planks/baobab.json | 5 - .../arboriculture/planks/cherry.json | 5 - .../arboriculture/planks/chestnut.json | 5 - .../arboriculture/planks/citrus.json | 5 - .../arboriculture/planks/cocobolo.json | 5 - .../arboriculture/planks/ebony.json | 5 - .../arboriculture/planks/giganteum.json | 5 - .../arboriculture/planks/greenheart.json | 5 - .../blockstates/arboriculture/planks/ipe.json | 5 - .../arboriculture/planks/kapok.json | 5 - .../arboriculture/planks/larch.json | 5 - .../arboriculture/planks/lime.json | 5 - .../arboriculture/planks/mahoe.json | 5 - .../arboriculture/planks/mahogany.json | 5 - .../arboriculture/planks/maple.json | 5 - .../arboriculture/planks/padauk.json | 5 - .../arboriculture/planks/palm.json | 5 - .../arboriculture/planks/papaya.json | 5 - .../arboriculture/planks/pine.json | 5 - .../arboriculture/planks/plum.json | 5 - .../arboriculture/planks/poplar.json | 5 - .../arboriculture/planks/sequoia.json | 5 - .../arboriculture/planks/teak.json | 5 - .../arboriculture/planks/walnut.json | 5 - .../arboriculture/planks/wenge.json | 5 - .../arboriculture/planks/willow.json | 5 - .../arboriculture/planks/zebrawood.json | 5 - .../blockstates/arboriculture/slab.json | 6 + .../arboriculture/slab/acacia.json | 6 - .../blockstates/arboriculture/slab/balsa.json | 6 - .../arboriculture/slab/baobab.json | 6 - .../arboriculture/slab/cherry.json | 6 - .../arboriculture/slab/chestnut.json | 6 - .../arboriculture/slab/citrus.json | 6 - .../arboriculture/slab/cocobolo.json | 6 - .../blockstates/arboriculture/slab/ebony.json | 6 - .../arboriculture/slab/giganteum.json | 6 - .../arboriculture/slab/greenheart.json | 6 - .../blockstates/arboriculture/slab/ipe.json | 6 - .../blockstates/arboriculture/slab/kapok.json | 6 - .../blockstates/arboriculture/slab/larch.json | 6 - .../blockstates/arboriculture/slab/lime.json | 6 - .../blockstates/arboriculture/slab/mahoe.json | 6 - .../arboriculture/slab/mahogany.json | 6 - .../blockstates/arboriculture/slab/maple.json | 6 - .../arboriculture/slab/padauk.json | 6 - .../blockstates/arboriculture/slab/palm.json | 6 - .../arboriculture/slab/papaya.json | 6 - .../blockstates/arboriculture/slab/pine.json | 6 - .../blockstates/arboriculture/slab/plum.json | 6 - .../arboriculture/slab/poplar.json | 6 - .../arboriculture/slab/sequoia.json | 6 - .../blockstates/arboriculture/slab/teak.json | 6 - .../arboriculture/slab/walnut.json | 6 - .../blockstates/arboriculture/slab/wenge.json | 6 - .../arboriculture/slab/willow.json | 6 - .../arboriculture/slab/zebrawood.json | 6 - .../blockstates/arboriculture/stairs.json | 44 +++ .../arboriculture/stairs/acacia.json | 44 --- .../arboriculture/stairs/balsa.json | 44 --- .../arboriculture/stairs/baobab.json | 44 --- .../arboriculture/stairs/cherry.json | 44 --- .../arboriculture/stairs/chestnut.json | 44 --- .../arboriculture/stairs/citrus.json | 44 --- .../arboriculture/stairs/cocobolo.json | 44 --- .../arboriculture/stairs/ebony.json | 44 --- .../arboriculture/stairs/giganteum.json | 44 --- .../arboriculture/stairs/greenheart.json | 44 --- .../blockstates/arboriculture/stairs/ipe.json | 44 --- .../arboriculture/stairs/kapok.json | 44 --- .../arboriculture/stairs/larch.json | 44 --- .../arboriculture/stairs/lime.json | 44 --- .../arboriculture/stairs/mahoe.json | 44 --- .../arboriculture/stairs/mahogany.json | 44 --- .../arboriculture/stairs/maple.json | 44 --- .../arboriculture/stairs/padauk.json | 44 --- .../arboriculture/stairs/palm.json | 44 --- .../arboriculture/stairs/papaya.json | 44 --- .../arboriculture/stairs/pine.json | 44 --- .../arboriculture/stairs/plum.json | 44 --- .../arboriculture/stairs/poplar.json | 44 --- .../arboriculture/stairs/sequoia.json | 44 --- .../arboriculture/stairs/teak.json | 44 --- .../arboriculture/stairs/walnut.json | 44 --- .../arboriculture/stairs/wenge.json | 44 --- .../arboriculture/stairs/willow.json | 44 --- .../arboriculture/stairs/zebrawood.json | 44 --- .../arboriculture/door/balsa_bottom.json | 7 - .../arboriculture/door/balsa_bottom_rh.json | 7 - .../block/arboriculture/door/balsa_top.json | 7 - .../arboriculture/door/balsa_top_rh.json | 7 - .../arboriculture/door/baobab_bottom.json | 7 - .../arboriculture/door/baobab_bottom_rh.json | 7 - .../block/arboriculture/door/baobab_top.json | 7 - .../arboriculture/door/baobab_top_rh.json | 7 - .../arboriculture/door/cherry_bottom.json | 7 - .../arboriculture/door/cherry_bottom_rh.json | 7 - .../block/arboriculture/door/cherry_top.json | 7 - .../arboriculture/door/cherry_top_rh.json | 7 - .../arboriculture/door/chestnut_bottom.json | 7 - .../door/chestnut_bottom_rh.json | 7 - .../arboriculture/door/chestnut_top.json | 7 - .../arboriculture/door/chestnut_top_rh.json | 7 - .../arboriculture/door/citrus_bottom.json | 7 - .../arboriculture/door/citrus_bottom_rh.json | 7 - .../block/arboriculture/door/citrus_top.json | 7 - .../arboriculture/door/citrus_top_rh.json | 7 - .../arboriculture/door/cocobolo_bottom.json | 7 - .../door/cocobolo_bottom_rh.json | 7 - .../arboriculture/door/cocobolo_top.json | 7 - .../arboriculture/door/cocobolo_top_rh.json | 7 - .../arboriculture/door/ebony_bottom.json | 7 - .../arboriculture/door/ebony_bottom_rh.json | 7 - .../block/arboriculture/door/ebony_top.json | 7 - .../arboriculture/door/ebony_top_rh.json | 7 - .../arboriculture/door/giganteum_bottom.json | 7 - .../door/giganteum_bottom_rh.json | 7 - .../arboriculture/door/giganteum_top.json | 7 - .../arboriculture/door/giganteum_top_rh.json | 7 - .../arboriculture/door/greenheart_bottom.json | 7 - .../door/greenheart_bottom_rh.json | 7 - .../arboriculture/door/greenheart_top.json | 7 - .../arboriculture/door/greenheart_top_rh.json | 7 - .../block/arboriculture/door/ipe_bottom.json | 7 - .../arboriculture/door/ipe_bottom_rh.json | 7 - .../block/arboriculture/door/ipe_top.json | 7 - .../block/arboriculture/door/ipe_top_rh.json | 7 - .../arboriculture/door/kapok_bottom.json | 7 - .../arboriculture/door/kapok_bottom_rh.json | 7 - .../block/arboriculture/door/kapok_top.json | 7 - .../arboriculture/door/kapok_top_rh.json | 7 - .../arboriculture/door/larch_bottom.json | 7 - .../arboriculture/door/larch_bottom_rh.json | 7 - .../block/arboriculture/door/larch_top.json | 7 - .../arboriculture/door/larch_top_rh.json | 7 - .../block/arboriculture/door/lime_bottom.json | 7 - .../arboriculture/door/lime_bottom_rh.json | 7 - .../block/arboriculture/door/lime_top.json | 7 - .../block/arboriculture/door/lime_top_rh.json | 7 - .../arboriculture/door/mahoe_bottom.json | 7 - .../arboriculture/door/mahoe_bottom_rh.json | 7 - .../block/arboriculture/door/mahoe_top.json | 7 - .../arboriculture/door/mahoe_top_rh.json | 7 - .../arboriculture/door/mahogany_bottom.json | 7 - .../door/mahogany_bottom_rh.json | 7 - .../arboriculture/door/mahogany_top.json | 7 - .../arboriculture/door/mahogany_top_rh.json | 7 - .../arboriculture/door/maple_bottom.json | 7 - .../arboriculture/door/maple_bottom_rh.json | 7 - .../block/arboriculture/door/maple_top.json | 7 - .../arboriculture/door/maple_top_rh.json | 7 - .../arboriculture/door/padauk_bottom.json | 7 - .../arboriculture/door/padauk_bottom_rh.json | 7 - .../block/arboriculture/door/padauk_top.json | 7 - .../arboriculture/door/padauk_top_rh.json | 7 - .../block/arboriculture/door/palm_bottom.json | 7 - .../arboriculture/door/palm_bottom_rh.json | 7 - .../block/arboriculture/door/palm_top.json | 7 - .../block/arboriculture/door/palm_top_rh.json | 7 - .../arboriculture/door/papaya_bottom.json | 7 - .../arboriculture/door/papaya_bottom_rh.json | 7 - .../block/arboriculture/door/papaya_top.json | 7 - .../arboriculture/door/papaya_top_rh.json | 7 - .../block/arboriculture/door/pine_bottom.json | 7 - .../arboriculture/door/pine_bottom_rh.json | 7 - .../block/arboriculture/door/pine_top.json | 7 - .../block/arboriculture/door/pine_top_rh.json | 7 - .../block/arboriculture/door/plum_bottom.json | 7 - .../arboriculture/door/plum_bottom_rh.json | 7 - .../block/arboriculture/door/plum_top.json | 7 - .../block/arboriculture/door/plum_top_rh.json | 7 - .../arboriculture/door/poplar_bottom.json | 7 - .../arboriculture/door/poplar_bottom_rh.json | 7 - .../block/arboriculture/door/poplar_top.json | 7 - .../arboriculture/door/poplar_top_rh.json | 7 - .../arboriculture/door/sequoia_bottom.json | 7 - .../arboriculture/door/sequoia_bottom_rh.json | 7 - .../block/arboriculture/door/sequoia_top.json | 7 - .../arboriculture/door/sequoia_top_rh.json | 7 - .../block/arboriculture/door/teak_bottom.json | 7 - .../arboriculture/door/teak_bottom_rh.json | 7 - .../block/arboriculture/door/teak_top.json | 7 - .../block/arboriculture/door/teak_top_rh.json | 7 - .../arboriculture/door/walnut_bottom.json | 7 - .../arboriculture/door/walnut_bottom_rh.json | 7 - .../block/arboriculture/door/walnut_top.json | 7 - .../arboriculture/door/walnut_top_rh.json | 7 - .../arboriculture/door/wenge_bottom.json | 7 - .../arboriculture/door/wenge_bottom_rh.json | 7 - .../block/arboriculture/door/wenge_top.json | 7 - .../arboriculture/door/wenge_top_rh.json | 7 - .../arboriculture/door/willow_bottom.json | 7 - .../arboriculture/door/willow_bottom_rh.json | 7 - .../block/arboriculture/door/willow_top.json | 7 - .../arboriculture/door/willow_top_rh.json | 7 - .../arboriculture/door/zebrawood_bottom.json | 7 - .../door/zebrawood_bottom_rh.json | 7 - .../arboriculture/door/zebrawood_top.json | 7 - .../arboriculture/door/zebrawood_top_rh.json | 7 - .../acacia_bottom.json => door_bottom.json} | 1 + ...cia_bottom_rh.json => door_bottom_rh.json} | 1 + .../{door/acacia_top.json => door_top.json} | 1 + .../acacia_top_rh.json => door_top_rh.json} | 1 + .../arboriculture/fence/balsa_inventory.json | 6 - .../block/arboriculture/fence/balsa_post.json | 6 - .../block/arboriculture/fence/balsa_side.json | 6 - .../arboriculture/fence/baobab_inventory.json | 6 - .../arboriculture/fence/baobab_post.json | 6 - .../arboriculture/fence/baobab_side.json | 6 - .../arboriculture/fence/cherry_inventory.json | 6 - .../arboriculture/fence/cherry_post.json | 6 - .../arboriculture/fence/cherry_side.json | 6 - .../fence/chestnut_inventory.json | 6 - .../arboriculture/fence/chestnut_post.json | 6 - .../arboriculture/fence/chestnut_side.json | 6 - .../arboriculture/fence/citrus_inventory.json | 6 - .../arboriculture/fence/citrus_post.json | 6 - .../arboriculture/fence/citrus_side.json | 6 - .../fence/cocobolo_inventory.json | 6 - .../arboriculture/fence/cocobolo_post.json | 6 - .../arboriculture/fence/cocobolo_side.json | 6 - .../arboriculture/fence/ebony_inventory.json | 6 - .../block/arboriculture/fence/ebony_post.json | 6 - .../block/arboriculture/fence/ebony_side.json | 6 - .../fence/giganteum_inventory.json | 6 - .../arboriculture/fence/giganteum_post.json | 6 - .../arboriculture/fence/giganteum_side.json | 6 - .../fence/greenheart_inventory.json | 6 - .../arboriculture/fence/greenheart_post.json | 6 - .../arboriculture/fence/greenheart_side.json | 6 - .../arboriculture/fence/ipe_inventory.json | 6 - .../block/arboriculture/fence/ipe_post.json | 6 - .../block/arboriculture/fence/ipe_side.json | 6 - .../arboriculture/fence/kapok_inventory.json | 6 - .../block/arboriculture/fence/kapok_post.json | 6 - .../block/arboriculture/fence/kapok_side.json | 6 - .../arboriculture/fence/larch_inventory.json | 6 - .../block/arboriculture/fence/larch_post.json | 6 - .../block/arboriculture/fence/larch_side.json | 6 - .../arboriculture/fence/lime_inventory.json | 6 - .../block/arboriculture/fence/lime_post.json | 6 - .../block/arboriculture/fence/lime_side.json | 6 - .../arboriculture/fence/mahoe_inventory.json | 6 - .../block/arboriculture/fence/mahoe_post.json | 6 - .../block/arboriculture/fence/mahoe_side.json | 6 - .../fence/mahogany_inventory.json | 6 - .../arboriculture/fence/mahogany_post.json | 6 - .../arboriculture/fence/mahogany_side.json | 6 - .../arboriculture/fence/maple_inventory.json | 6 - .../block/arboriculture/fence/maple_post.json | 6 - .../block/arboriculture/fence/maple_side.json | 6 - .../arboriculture/fence/padauk_inventory.json | 6 - .../arboriculture/fence/padauk_post.json | 6 - .../arboriculture/fence/padauk_side.json | 6 - .../arboriculture/fence/palm_inventory.json | 6 - .../block/arboriculture/fence/palm_post.json | 6 - .../block/arboriculture/fence/palm_side.json | 6 - .../arboriculture/fence/papaya_inventory.json | 6 - .../arboriculture/fence/papaya_post.json | 6 - .../arboriculture/fence/papaya_side.json | 6 - .../arboriculture/fence/pine_inventory.json | 6 - .../block/arboriculture/fence/pine_post.json | 6 - .../block/arboriculture/fence/pine_side.json | 6 - .../arboriculture/fence/plum_inventory.json | 6 - .../block/arboriculture/fence/plum_post.json | 6 - .../block/arboriculture/fence/plum_side.json | 6 - .../arboriculture/fence/poplar_inventory.json | 6 - .../arboriculture/fence/poplar_post.json | 6 - .../arboriculture/fence/poplar_side.json | 6 - .../fence/sequoia_inventory.json | 6 - .../arboriculture/fence/sequoia_post.json | 6 - .../arboriculture/fence/sequoia_side.json | 6 - .../arboriculture/fence/teak_inventory.json | 6 - .../block/arboriculture/fence/teak_post.json | 6 - .../block/arboriculture/fence/teak_side.json | 6 - .../arboriculture/fence/walnut_inventory.json | 6 - .../arboriculture/fence/walnut_post.json | 6 - .../arboriculture/fence/walnut_side.json | 6 - .../arboriculture/fence/wenge_inventory.json | 6 - .../block/arboriculture/fence/wenge_post.json | 6 - .../block/arboriculture/fence/wenge_side.json | 6 - .../arboriculture/fence/willow_inventory.json | 6 - .../arboriculture/fence/willow_post.json | 6 - .../arboriculture/fence/willow_side.json | 6 - .../fence/zebrawood_inventory.json | 6 - .../arboriculture/fence/zebrawood_post.json | 6 - .../arboriculture/fence/zebrawood_side.json | 6 - .../fence_gate/balsa_closed.json | 6 - .../arboriculture/fence_gate/balsa_open.json | 6 - .../fence_gate/balsa_wall_closed.json | 6 - .../fence_gate/balsa_wall_open.json | 6 - .../fence_gate/baobab_closed.json | 6 - .../arboriculture/fence_gate/baobab_open.json | 6 - .../fence_gate/baobab_wall_closed.json | 6 - .../fence_gate/baobab_wall_open.json | 6 - .../fence_gate/cherry_closed.json | 6 - .../arboriculture/fence_gate/cherry_open.json | 6 - .../fence_gate/cherry_wall_closed.json | 6 - .../fence_gate/cherry_wall_open.json | 6 - .../fence_gate/chestnut_closed.json | 6 - .../fence_gate/chestnut_open.json | 6 - .../fence_gate/chestnut_wall_closed.json | 6 - .../fence_gate/chestnut_wall_open.json | 6 - .../fence_gate/citrus_closed.json | 6 - .../arboriculture/fence_gate/citrus_open.json | 6 - .../fence_gate/citrus_wall_closed.json | 6 - .../fence_gate/citrus_wall_open.json | 6 - .../fence_gate/cocobolo_closed.json | 6 - .../fence_gate/cocobolo_open.json | 6 - .../fence_gate/cocobolo_wall_closed.json | 6 - .../fence_gate/cocobolo_wall_open.json | 6 - .../fence_gate/ebony_closed.json | 6 - .../arboriculture/fence_gate/ebony_open.json | 6 - .../fence_gate/ebony_wall_closed.json | 6 - .../fence_gate/ebony_wall_open.json | 6 - .../fence_gate/giganteum_closed.json | 6 - .../fence_gate/giganteum_open.json | 6 - .../fence_gate/giganteum_wall_closed.json | 6 - .../fence_gate/giganteum_wall_open.json | 6 - .../fence_gate/greenheart_closed.json | 6 - .../fence_gate/greenheart_open.json | 6 - .../fence_gate/greenheart_wall_closed.json | 6 - .../fence_gate/greenheart_wall_open.json | 6 - .../arboriculture/fence_gate/ipe_closed.json | 6 - .../arboriculture/fence_gate/ipe_open.json | 6 - .../fence_gate/ipe_wall_closed.json | 6 - .../fence_gate/ipe_wall_open.json | 6 - .../fence_gate/kapok_closed.json | 6 - .../arboriculture/fence_gate/kapok_open.json | 6 - .../fence_gate/kapok_wall_closed.json | 6 - .../fence_gate/kapok_wall_open.json | 6 - .../fence_gate/larch_closed.json | 6 - .../arboriculture/fence_gate/larch_open.json | 6 - .../fence_gate/larch_wall_closed.json | 6 - .../fence_gate/larch_wall_open.json | 6 - .../arboriculture/fence_gate/lime_closed.json | 6 - .../arboriculture/fence_gate/lime_open.json | 6 - .../fence_gate/lime_wall_closed.json | 6 - .../fence_gate/lime_wall_open.json | 6 - .../fence_gate/mahoe_closed.json | 6 - .../arboriculture/fence_gate/mahoe_open.json | 6 - .../fence_gate/mahoe_wall_closed.json | 6 - .../fence_gate/mahoe_wall_open.json | 6 - .../fence_gate/mahogany_closed.json | 6 - .../fence_gate/mahogany_open.json | 6 - .../fence_gate/mahogany_wall_closed.json | 6 - .../fence_gate/mahogany_wall_open.json | 6 - .../fence_gate/maple_closed.json | 6 - .../arboriculture/fence_gate/maple_open.json | 6 - .../fence_gate/maple_wall_closed.json | 6 - .../fence_gate/maple_wall_open.json | 6 - .../fence_gate/padauk_closed.json | 6 - .../arboriculture/fence_gate/padauk_open.json | 6 - .../fence_gate/padauk_wall_closed.json | 6 - .../fence_gate/padauk_wall_open.json | 6 - .../arboriculture/fence_gate/palm_closed.json | 6 - .../arboriculture/fence_gate/palm_open.json | 6 - .../fence_gate/palm_wall_closed.json | 6 - .../fence_gate/palm_wall_open.json | 6 - .../fence_gate/papaya_closed.json | 6 - .../arboriculture/fence_gate/papaya_open.json | 6 - .../fence_gate/papaya_wall_closed.json | 6 - .../fence_gate/papaya_wall_open.json | 6 - .../arboriculture/fence_gate/pine_closed.json | 6 - .../arboriculture/fence_gate/pine_open.json | 6 - .../fence_gate/pine_wall_closed.json | 6 - .../fence_gate/pine_wall_open.json | 6 - .../arboriculture/fence_gate/plum_closed.json | 6 - .../arboriculture/fence_gate/plum_open.json | 6 - .../fence_gate/plum_wall_closed.json | 6 - .../fence_gate/plum_wall_open.json | 6 - .../fence_gate/poplar_closed.json | 6 - .../arboriculture/fence_gate/poplar_open.json | 6 - .../fence_gate/poplar_wall_closed.json | 6 - .../fence_gate/poplar_wall_open.json | 6 - .../fence_gate/sequoia_closed.json | 6 - .../fence_gate/sequoia_open.json | 6 - .../fence_gate/sequoia_wall_closed.json | 6 - .../fence_gate/sequoia_wall_open.json | 6 - .../arboriculture/fence_gate/teak_closed.json | 6 - .../arboriculture/fence_gate/teak_open.json | 6 - .../fence_gate/teak_wall_closed.json | 6 - .../fence_gate/teak_wall_open.json | 6 - .../fence_gate/walnut_closed.json | 6 - .../arboriculture/fence_gate/walnut_open.json | 6 - .../fence_gate/walnut_wall_closed.json | 6 - .../fence_gate/walnut_wall_open.json | 6 - .../fence_gate/wenge_closed.json | 6 - .../arboriculture/fence_gate/wenge_open.json | 6 - .../fence_gate/wenge_wall_closed.json | 6 - .../fence_gate/wenge_wall_open.json | 6 - .../fence_gate/willow_closed.json | 6 - .../arboriculture/fence_gate/willow_open.json | 6 - .../fence_gate/willow_wall_closed.json | 6 - .../fence_gate/willow_wall_open.json | 6 - .../fence_gate/zebrawood_closed.json | 6 - .../fence_gate/zebrawood_open.json | 6 - .../fence_gate/zebrawood_wall_closed.json | 6 - .../fence_gate/zebrawood_wall_open.json | 6 - ...cia_closed.json => fence_gate_closed.json} | 1 + .../acacia_open.json => fence_gate_open.json} | 1 + ...losed.json => fence_gate_wall_closed.json} | 0 ...ll_open.json => fence_gate_wall_open.json} | 2 +- ...ia_inventory.json => fence_inventory.json} | 0 .../acacia_post.json => fence_post.json} | 1 + .../acacia_side.json => fence_side.json} | 1 + .../{log/acacia.json => log.json} | 0 .../models/block/arboriculture/log/balsa.json | 7 - .../block/arboriculture/log/balsa_bark.json | 6 - .../block/arboriculture/log/balsa_side.json | 7 - .../block/arboriculture/log/baobab.json | 7 - .../block/arboriculture/log/baobab_bark.json | 6 - .../block/arboriculture/log/baobab_side.json | 7 - .../block/arboriculture/log/cherry.json | 7 - .../block/arboriculture/log/cherry_bark.json | 6 - .../block/arboriculture/log/cherry_side.json | 7 - .../block/arboriculture/log/chestnut.json | 7 - .../arboriculture/log/chestnut_bark.json | 6 - .../arboriculture/log/chestnut_side.json | 7 - .../block/arboriculture/log/citrus.json | 7 - .../block/arboriculture/log/citrus_bark.json | 6 - .../block/arboriculture/log/citrus_side.json | 7 - .../block/arboriculture/log/cocobolo.json | 7 - .../arboriculture/log/cocobolo_bark.json | 6 - .../arboriculture/log/cocobolo_side.json | 7 - .../models/block/arboriculture/log/ebony.json | 7 - .../block/arboriculture/log/ebony_bark.json | 6 - .../block/arboriculture/log/ebony_side.json | 7 - .../block/arboriculture/log/giganteum.json | 7 - .../arboriculture/log/giganteum_bark.json | 6 - .../arboriculture/log/giganteum_side.json | 7 - .../block/arboriculture/log/greenheart.json | 7 - .../arboriculture/log/greenheart_bark.json | 6 - .../arboriculture/log/greenheart_side.json | 7 - .../models/block/arboriculture/log/ipe.json | 7 - .../block/arboriculture/log/ipe_bark.json | 6 - .../block/arboriculture/log/ipe_side.json | 7 - .../models/block/arboriculture/log/kapok.json | 7 - .../block/arboriculture/log/kapok_bark.json | 6 - .../block/arboriculture/log/kapok_side.json | 7 - .../models/block/arboriculture/log/larch.json | 7 - .../block/arboriculture/log/larch_bark.json | 6 - .../block/arboriculture/log/larch_side.json | 7 - .../models/block/arboriculture/log/lime.json | 7 - .../block/arboriculture/log/lime_bark.json | 6 - .../block/arboriculture/log/lime_side.json | 7 - .../models/block/arboriculture/log/mahoe.json | 7 - .../block/arboriculture/log/mahoe_bark.json | 6 - .../block/arboriculture/log/mahoe_side.json | 7 - .../block/arboriculture/log/mahogany.json | 7 - .../arboriculture/log/mahogany_bark.json | 6 - .../arboriculture/log/mahogany_side.json | 7 - .../models/block/arboriculture/log/maple.json | 7 - .../block/arboriculture/log/maple_bark.json | 6 - .../block/arboriculture/log/maple_side.json | 7 - .../block/arboriculture/log/padauk.json | 7 - .../block/arboriculture/log/padauk_bark.json | 6 - .../block/arboriculture/log/padauk_side.json | 7 - .../models/block/arboriculture/log/palm.json | 7 - .../block/arboriculture/log/palm_bark.json | 6 - .../block/arboriculture/log/palm_side.json | 7 - .../block/arboriculture/log/papaya.json | 7 - .../block/arboriculture/log/papaya_bark.json | 6 - .../block/arboriculture/log/papaya_side.json | 7 - .../models/block/arboriculture/log/pine.json | 7 - .../block/arboriculture/log/pine_bark.json | 6 - .../block/arboriculture/log/pine_side.json | 7 - .../models/block/arboriculture/log/plum.json | 7 - .../block/arboriculture/log/plum_bark.json | 6 - .../block/arboriculture/log/plum_side.json | 7 - .../block/arboriculture/log/poplar.json | 7 - .../block/arboriculture/log/poplar_bark.json | 6 - .../block/arboriculture/log/poplar_side.json | 7 - .../block/arboriculture/log/sequoia.json | 7 - .../block/arboriculture/log/sequoia_bark.json | 6 - .../block/arboriculture/log/sequoia_side.json | 7 - .../models/block/arboriculture/log/teak.json | 7 - .../block/arboriculture/log/teak_bark.json | 6 - .../block/arboriculture/log/teak_side.json | 7 - .../block/arboriculture/log/walnut.json | 7 - .../block/arboriculture/log/walnut_bark.json | 6 - .../block/arboriculture/log/walnut_side.json | 7 - .../models/block/arboriculture/log/wenge.json | 7 - .../block/arboriculture/log/wenge_bark.json | 6 - .../block/arboriculture/log/wenge_side.json | 7 - .../block/arboriculture/log/willow.json | 7 - .../block/arboriculture/log/willow_bark.json | 6 - .../block/arboriculture/log/willow_side.json | 7 - .../block/arboriculture/log/zebrawood.json | 7 - .../arboriculture/log/zebrawood_bark.json | 6 - .../arboriculture/log/zebrawood_side.json | 7 - .../{log/acacia_bark.json => log_bark.json} | 0 .../{log/acacia_side.json => log_side.json} | 0 .../{planks/acacia.json => planks.json} | 0 .../block/arboriculture/planks/balsa.json | 6 - .../block/arboriculture/planks/baobab.json | 6 - .../block/arboriculture/planks/cherry.json | 6 - .../block/arboriculture/planks/chestnut.json | 6 - .../block/arboriculture/planks/citrus.json | 6 - .../block/arboriculture/planks/cocobolo.json | 6 - .../block/arboriculture/planks/ebony.json | 6 - .../block/arboriculture/planks/giganteum.json | 6 - .../arboriculture/planks/greenheart.json | 6 - .../block/arboriculture/planks/ipe.json | 6 - .../block/arboriculture/planks/kapok.json | 6 - .../block/arboriculture/planks/larch.json | 6 - .../block/arboriculture/planks/lime.json | 6 - .../block/arboriculture/planks/mahoe.json | 6 - .../block/arboriculture/planks/mahogany.json | 6 - .../block/arboriculture/planks/maple.json | 6 - .../block/arboriculture/planks/padauk.json | 6 - .../block/arboriculture/planks/palm.json | 6 - .../block/arboriculture/planks/papaya.json | 6 - .../block/arboriculture/planks/pine.json | 6 - .../block/arboriculture/planks/plum.json | 6 - .../block/arboriculture/planks/poplar.json | 6 - .../block/arboriculture/planks/sequoia.json | 6 - .../block/arboriculture/planks/teak.json | 6 - .../block/arboriculture/planks/walnut.json | 6 - .../block/arboriculture/planks/wenge.json | 6 - .../block/arboriculture/planks/willow.json | 6 - .../block/arboriculture/planks/zebrawood.json | 6 - .../arboriculture/slab/acacia_double.json | 8 - .../arboriculture/slab/balsa_double.json | 8 - .../block/arboriculture/slab/balsa_half.json | 8 - .../block/arboriculture/slab/balsa_upper.json | 8 - .../arboriculture/slab/baobab_double.json | 8 - .../block/arboriculture/slab/baobab_half.json | 8 - .../arboriculture/slab/baobab_upper.json | 8 - .../arboriculture/slab/cherry_double.json | 8 - .../block/arboriculture/slab/cherry_half.json | 8 - .../arboriculture/slab/cherry_upper.json | 8 - .../arboriculture/slab/chestnut_double.json | 8 - .../arboriculture/slab/chestnut_half.json | 8 - .../arboriculture/slab/chestnut_upper.json | 8 - .../arboriculture/slab/citrus_double.json | 8 - .../block/arboriculture/slab/citrus_half.json | 8 - .../arboriculture/slab/citrus_upper.json | 8 - .../arboriculture/slab/cocobolo_double.json | 8 - .../arboriculture/slab/cocobolo_half.json | 8 - .../arboriculture/slab/cocobolo_upper.json | 8 - .../arboriculture/slab/ebony_double.json | 8 - .../block/arboriculture/slab/ebony_half.json | 8 - .../block/arboriculture/slab/ebony_upper.json | 8 - .../arboriculture/slab/giganteum_double.json | 8 - .../arboriculture/slab/giganteum_half.json | 8 - .../arboriculture/slab/giganteum_upper.json | 8 - .../arboriculture/slab/greenheart_double.json | 8 - .../arboriculture/slab/greenheart_half.json | 8 - .../arboriculture/slab/greenheart_upper.json | 8 - .../block/arboriculture/slab/ipe_double.json | 8 - .../block/arboriculture/slab/ipe_half.json | 8 - .../block/arboriculture/slab/ipe_upper.json | 8 - .../arboriculture/slab/kapok_double.json | 8 - .../block/arboriculture/slab/kapok_half.json | 8 - .../block/arboriculture/slab/kapok_upper.json | 8 - .../arboriculture/slab/larch_double.json | 8 - .../block/arboriculture/slab/larch_half.json | 8 - .../block/arboriculture/slab/larch_upper.json | 8 - .../block/arboriculture/slab/lime_double.json | 8 - .../block/arboriculture/slab/lime_half.json | 8 - .../block/arboriculture/slab/lime_upper.json | 8 - .../arboriculture/slab/mahoe_double.json | 8 - .../block/arboriculture/slab/mahoe_half.json | 8 - .../block/arboriculture/slab/mahoe_upper.json | 8 - .../arboriculture/slab/mahogany_double.json | 8 - .../arboriculture/slab/mahogany_half.json | 8 - .../arboriculture/slab/mahogany_upper.json | 8 - .../arboriculture/slab/maple_double.json | 8 - .../block/arboriculture/slab/maple_half.json | 8 - .../block/arboriculture/slab/maple_upper.json | 8 - .../arboriculture/slab/padauk_double.json | 8 - .../block/arboriculture/slab/padauk_half.json | 8 - .../arboriculture/slab/padauk_upper.json | 8 - .../block/arboriculture/slab/palm_double.json | 8 - .../block/arboriculture/slab/palm_half.json | 8 - .../block/arboriculture/slab/palm_upper.json | 8 - .../arboriculture/slab/papaya_double.json | 8 - .../block/arboriculture/slab/papaya_half.json | 8 - .../arboriculture/slab/papaya_upper.json | 8 - .../block/arboriculture/slab/pine_double.json | 8 - .../block/arboriculture/slab/pine_half.json | 8 - .../block/arboriculture/slab/pine_upper.json | 8 - .../block/arboriculture/slab/plum_double.json | 8 - .../block/arboriculture/slab/plum_half.json | 8 - .../block/arboriculture/slab/plum_upper.json | 8 - .../arboriculture/slab/poplar_double.json | 8 - .../block/arboriculture/slab/poplar_half.json | 8 - .../arboriculture/slab/poplar_upper.json | 8 - .../arboriculture/slab/sequoia_double.json | 8 - .../arboriculture/slab/sequoia_half.json | 8 - .../arboriculture/slab/sequoia_upper.json | 8 - .../block/arboriculture/slab/teak_double.json | 8 - .../block/arboriculture/slab/teak_half.json | 8 - .../block/arboriculture/slab/teak_upper.json | 8 - .../arboriculture/slab/walnut_double.json | 8 - .../block/arboriculture/slab/walnut_half.json | 8 - .../arboriculture/slab/walnut_upper.json | 8 - .../arboriculture/slab/wenge_double.json | 8 - .../block/arboriculture/slab/wenge_half.json | 8 - .../block/arboriculture/slab/wenge_upper.json | 8 - .../arboriculture/slab/willow_double.json | 8 - .../block/arboriculture/slab/willow_half.json | 8 - .../arboriculture/slab/willow_upper.json | 8 - .../arboriculture/slab/zebrawood_double.json | 8 - .../arboriculture/slab/zebrawood_half.json | 8 - .../arboriculture/slab/zebrawood_upper.json | 8 - .../block/arboriculture/slab_double.json | 7 + .../{slab/acacia_half.json => slab_half.json} | 1 + .../acacia_upper.json => slab_upper.json} | 1 + .../{stairs/acacia.json => stairs.json} | 1 + .../block/arboriculture/stairs/balsa.json | 8 - .../arboriculture/stairs/balsa_inner.json | 8 - .../arboriculture/stairs/balsa_outer.json | 8 - .../block/arboriculture/stairs/baobab.json | 8 - .../arboriculture/stairs/baobab_inner.json | 8 - .../arboriculture/stairs/baobab_outer.json | 8 - .../block/arboriculture/stairs/cherry.json | 8 - .../arboriculture/stairs/cherry_inner.json | 8 - .../arboriculture/stairs/cherry_outer.json | 8 - .../block/arboriculture/stairs/chestnut.json | 8 - .../arboriculture/stairs/chestnut_inner.json | 8 - .../arboriculture/stairs/chestnut_outer.json | 8 - .../block/arboriculture/stairs/citrus.json | 8 - .../arboriculture/stairs/citrus_inner.json | 8 - .../arboriculture/stairs/citrus_outer.json | 8 - .../block/arboriculture/stairs/cocobolo.json | 8 - .../arboriculture/stairs/cocobolo_inner.json | 8 - .../arboriculture/stairs/cocobolo_outer.json | 8 - .../block/arboriculture/stairs/ebony.json | 8 - .../arboriculture/stairs/ebony_inner.json | 8 - .../arboriculture/stairs/ebony_outer.json | 8 - .../block/arboriculture/stairs/giganteum.json | 8 - .../arboriculture/stairs/giganteum_inner.json | 8 - .../arboriculture/stairs/giganteum_outer.json | 8 - .../arboriculture/stairs/greenheart.json | 8 - .../stairs/greenheart_inner.json | 8 - .../stairs/greenheart_outer.json | 8 - .../block/arboriculture/stairs/ipe.json | 8 - .../block/arboriculture/stairs/ipe_inner.json | 8 - .../block/arboriculture/stairs/ipe_outer.json | 8 - .../block/arboriculture/stairs/kapok.json | 8 - .../arboriculture/stairs/kapok_inner.json | 8 - .../arboriculture/stairs/kapok_outer.json | 8 - .../block/arboriculture/stairs/larch.json | 8 - .../arboriculture/stairs/larch_inner.json | 8 - .../arboriculture/stairs/larch_outer.json | 8 - .../block/arboriculture/stairs/lime.json | 8 - .../arboriculture/stairs/lime_inner.json | 8 - .../arboriculture/stairs/lime_outer.json | 8 - .../block/arboriculture/stairs/mahoe.json | 8 - .../arboriculture/stairs/mahoe_inner.json | 8 - .../arboriculture/stairs/mahoe_outer.json | 8 - .../block/arboriculture/stairs/mahogany.json | 8 - .../arboriculture/stairs/mahogany_inner.json | 8 - .../arboriculture/stairs/mahogany_outer.json | 8 - .../block/arboriculture/stairs/maple.json | 8 - .../arboriculture/stairs/maple_inner.json | 8 - .../arboriculture/stairs/maple_outer.json | 8 - .../block/arboriculture/stairs/padauk.json | 8 - .../arboriculture/stairs/padauk_inner.json | 8 - .../arboriculture/stairs/padauk_outer.json | 8 - .../block/arboriculture/stairs/palm.json | 8 - .../arboriculture/stairs/palm_inner.json | 8 - .../arboriculture/stairs/palm_outer.json | 8 - .../block/arboriculture/stairs/papaya.json | 8 - .../arboriculture/stairs/papaya_inner.json | 8 - .../arboriculture/stairs/papaya_outer.json | 8 - .../block/arboriculture/stairs/pine.json | 8 - .../arboriculture/stairs/pine_inner.json | 8 - .../arboriculture/stairs/pine_outer.json | 8 - .../block/arboriculture/stairs/plum.json | 8 - .../arboriculture/stairs/plum_inner.json | 8 - .../arboriculture/stairs/plum_outer.json | 8 - .../block/arboriculture/stairs/poplar.json | 8 - .../arboriculture/stairs/poplar_inner.json | 8 - .../arboriculture/stairs/poplar_outer.json | 8 - .../block/arboriculture/stairs/sequoia.json | 8 - .../arboriculture/stairs/sequoia_inner.json | 8 - .../arboriculture/stairs/sequoia_outer.json | 8 - .../block/arboriculture/stairs/teak.json | 8 - .../arboriculture/stairs/teak_inner.json | 8 - .../arboriculture/stairs/teak_outer.json | 8 - .../block/arboriculture/stairs/walnut.json | 8 - .../arboriculture/stairs/walnut_inner.json | 8 - .../arboriculture/stairs/walnut_outer.json | 8 - .../block/arboriculture/stairs/wenge.json | 8 - .../arboriculture/stairs/wenge_inner.json | 8 - .../arboriculture/stairs/wenge_outer.json | 8 - .../block/arboriculture/stairs/willow.json | 8 - .../arboriculture/stairs/willow_inner.json | 8 - .../arboriculture/stairs/willow_outer.json | 8 - .../block/arboriculture/stairs/zebrawood.json | 8 - .../arboriculture/stairs/zebrawood_inner.json | 8 - .../arboriculture/stairs/zebrawood_outer.json | 8 - .../acacia_inner.json => stairs_inner.json} | 1 + .../acacia_outer.json => stairs_outer.json} | 1 + .../assets/forestry/models/item/door.json | 18 ++ .../assets/forestry/models/item/fence.json | 3 + .../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 - .../{fence_gate/ipe.json => fence_gate.json} | 2 +- .../models/item/fence_gate/acacia.json | 39 --- .../models/item/fence_gate/balsa.json | 39 --- .../models/item/fence_gate/baobab.json | 39 --- .../models/item/fence_gate/cherry.json | 39 --- .../models/item/fence_gate/chestnut.json | 39 --- .../models/item/fence_gate/citrus.json | 39 --- .../models/item/fence_gate/cocobolo.json | 39 --- .../models/item/fence_gate/ebony.json | 39 --- .../models/item/fence_gate/giganteum.json | 39 --- .../models/item/fence_gate/greenheart.json | 39 --- .../models/item/fence_gate/kapok.json | 39 --- .../models/item/fence_gate/larch.json | 39 --- .../forestry/models/item/fence_gate/lime.json | 39 --- .../models/item/fence_gate/mahoe.json | 39 --- .../models/item/fence_gate/mahogany.json | 39 --- .../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 --- .../models/item/fence_gate/sequoia.json | 39 --- .../forestry/models/item/fence_gate/teak.json | 39 --- .../models/item/fence_gate/walnut.json | 39 --- .../models/item/fence_gate/wenge.json | 39 --- .../models/item/fence_gate/willow.json | 39 --- .../models/item/fence_gate/zebrawood.json | 39 --- .../models/item/{planks/ipe.json => log.json} | 2 +- .../assets/forestry/models/item/planks.json | 3 - .../forestry/models/item/planks/acacia.json | 10 - .../forestry/models/item/planks/balsa.json | 10 - .../forestry/models/item/planks/baobab.json | 10 - .../forestry/models/item/planks/cherry.json | 10 - .../forestry/models/item/planks/chestnut.json | 10 - .../forestry/models/item/planks/citrus.json | 10 - .../forestry/models/item/planks/cocobolo.json | 10 - .../forestry/models/item/planks/ebony.json | 10 - .../models/item/planks/giganteum.json | 10 - .../models/item/planks/greenheart.json | 10 - .../forestry/models/item/planks/kapok.json | 10 - .../forestry/models/item/planks/larch.json | 10 - .../forestry/models/item/planks/mahoe.json | 10 - .../forestry/models/item/planks/mahogany.json | 10 - .../forestry/models/item/planks/maple.json | 10 - .../forestry/models/item/planks/padauk.json | 10 - .../forestry/models/item/planks/palm.json | 10 - .../forestry/models/item/planks/papaya.json | 10 - .../forestry/models/item/planks/pine.json | 10 - .../forestry/models/item/planks/plum.json | 10 - .../forestry/models/item/planks/poplar.json | 10 - .../forestry/models/item/planks/sequoia.json | 10 - .../forestry/models/item/planks/teak.json | 10 - .../forestry/models/item/planks/walnut.json | 10 - .../forestry/models/item/planks/wenge.json | 10 - .../forestry/models/item/planks/willow.json | 10 - .../models/item/planks/zebrawood.json | 10 - .../item/{planks/lime.json => slab.json} | 2 +- .../forestry/models/item/slab/acacia.json | 10 - .../forestry/models/item/slab/balsa.json | 10 - .../forestry/models/item/slab/baobab.json | 10 - .../forestry/models/item/slab/cherry.json | 10 - .../forestry/models/item/slab/chestnut.json | 10 - .../forestry/models/item/slab/citrus.json | 10 - .../forestry/models/item/slab/cocobolo.json | 10 - .../forestry/models/item/slab/ebony.json | 10 - .../forestry/models/item/slab/giganteum.json | 10 - .../forestry/models/item/slab/greenheart.json | 10 - .../assets/forestry/models/item/slab/ipe.json | 10 - .../forestry/models/item/slab/kapok.json | 10 - .../forestry/models/item/slab/larch.json | 10 - .../forestry/models/item/slab/lime.json | 10 - .../forestry/models/item/slab/mahoe.json | 10 - .../forestry/models/item/slab/mahogany.json | 10 - .../forestry/models/item/slab/maple.json | 10 - .../forestry/models/item/slab/padauk.json | 10 - .../forestry/models/item/slab/palm.json | 10 - .../forestry/models/item/slab/papaya.json | 10 - .../forestry/models/item/slab/pine.json | 10 - .../forestry/models/item/slab/plum.json | 10 - .../forestry/models/item/slab/poplar.json | 10 - .../forestry/models/item/slab/sequoia.json | 10 - .../forestry/models/item/slab/teak.json | 10 - .../forestry/models/item/slab/walnut.json | 10 - .../forestry/models/item/slab/wenge.json | 10 - .../forestry/models/item/slab/willow.json | 10 - .../forestry/models/item/slab/zebrawood.json | 10 - .../assets/forestry/models/item/stairs.json | 3 - .../forestry/models/item/stairs/acacia.json | 3 - .../forestry/models/item/stairs/balsa.json | 3 - .../forestry/models/item/stairs/baobab.json | 3 - .../forestry/models/item/stairs/cherry.json | 3 - .../forestry/models/item/stairs/chestnut.json | 3 - .../forestry/models/item/stairs/citrus.json | 3 - .../forestry/models/item/stairs/cocobolo.json | 3 - .../forestry/models/item/stairs/ebony.json | 3 - .../models/item/stairs/giganteum.json | 3 - .../models/item/stairs/greenheart.json | 3 - .../forestry/models/item/stairs/ipe.json | 3 - .../forestry/models/item/stairs/kapok.json | 3 - .../forestry/models/item/stairs/larch.json | 3 - .../forestry/models/item/stairs/lime.json | 3 - .../forestry/models/item/stairs/mahoe.json | 3 - .../forestry/models/item/stairs/mahogany.json | 3 - .../forestry/models/item/stairs/maple.json | 3 - .../forestry/models/item/stairs/padauk.json | 3 - .../forestry/models/item/stairs/palm.json | 3 - .../forestry/models/item/stairs/papaya.json | 3 - .../forestry/models/item/stairs/pine.json | 3 - .../forestry/models/item/stairs/plum.json | 3 - .../forestry/models/item/stairs/poplar.json | 3 - .../forestry/models/item/stairs/sequoia.json | 3 - .../forestry/models/item/stairs/teak.json | 3 - .../forestry/models/item/stairs/walnut.json | 3 - .../forestry/models/item/stairs/wenge.json | 3 - .../forestry/models/item/stairs/willow.json | 3 - .../models/item/stairs/zebrawood.json | 3 - 1039 files changed, 1010 insertions(+), 10034 deletions(-) create mode 100644 src/main/java/forestry/api/arboriculture/IWoodItemMeshDefinition.java create mode 100644 src/main/java/forestry/api/arboriculture/IWoodStateMapper.java create mode 100644 src/main/java/forestry/arboriculture/models/WoodModelLoader.java rename src/main/java/forestry/core/models/{BlankItemModel.java => BlankModel.java} (96%) rename src/main/java/forestry/core/models/{BlockModelIndex.java => BlockModelEntry.java} (89%) rename src/main/java/forestry/core/models/{ModelIndex.java => ModelEntry.java} (91%) create mode 100644 src/main/java/forestry/core/models/SimpleRetexturedModel.java create mode 100644 src/main/java/forestry/core/models/WoodModelEntry.java rename src/main/resources/assets/forestry/blockstates/arboriculture/{door/ipe.json => door.json} (55%) delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/door/zebrawood.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/zebrawood.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence/zebrawood.json rename src/main/resources/assets/forestry/blockstates/arboriculture/{fence_gate/ipe.json => fence_gate.json} (51%) delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/zebrawood.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/log/zebrawood.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/planks/zebrawood.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/slab/zebrawood.json create mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/acacia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/balsa.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/baobab.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cherry.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/chestnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/citrus.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ebony.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/giganteum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/greenheart.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ipe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/kapok.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/larch.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/lime.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahoe.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahogany.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/maple.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/padauk.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/palm.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/papaya.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/pine.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/plum.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/poplar.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/sequoia.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/teak.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/walnut.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/wenge.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/willow.json delete mode 100644 src/main/resources/assets/forestry/blockstates/arboriculture/stairs/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom_rh.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top_rh.json rename src/main/resources/assets/forestry/models/block/arboriculture/{door/acacia_bottom.json => door_bottom.json} (74%) rename src/main/resources/assets/forestry/models/block/arboriculture/{door/acacia_bottom_rh.json => door_bottom_rh.json} (75%) rename src/main/resources/assets/forestry/models/block/arboriculture/{door/acacia_top.json => door_top.json} (74%) rename src/main/resources/assets/forestry/models/block/arboriculture/{door/acacia_top_rh.json => door_top_rh.json} (74%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_inventory.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_post.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_open.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_closed.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_open.json rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gate/acacia_closed.json => fence_gate_closed.json} (67%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gate/acacia_open.json => fence_gate_open.json} (66%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gate/acacia_wall_closed.json => fence_gate_wall_closed.json} (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence_gate/acacia_wall_open.json => fence_gate_wall_open.json} (65%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence/acacia_inventory.json => fence_inventory.json} (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence/acacia_post.json => fence_post.json} (65%) rename src/main/resources/assets/forestry/models/block/arboriculture/{fence/acacia_side.json => fence_side.json} (65%) rename src/main/resources/assets/forestry/models/block/arboriculture/{log/acacia.json => log.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/larch.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/larch_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/larch_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/lime.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/lime_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/lime_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/maple.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/maple_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/maple_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/palm.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/palm_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/palm_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/pine.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/pine_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/pine_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/plum.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/plum_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/plum_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/teak.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/teak_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/teak_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/willow.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/willow_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/willow_side.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_bark.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_side.json rename src/main/resources/assets/forestry/models/block/arboriculture/{log/acacia_bark.json => log_bark.json} (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{log/acacia_side.json => log_side.json} (100%) rename src/main/resources/assets/forestry/models/block/arboriculture/{planks/acacia.json => planks.json} (100%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json create mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/slab_double.json rename src/main/resources/assets/forestry/models/block/arboriculture/{slab/acacia_half.json => slab_half.json} (79%) rename src/main/resources/assets/forestry/models/block/arboriculture/{slab/acacia_upper.json => slab_upper.json} (79%) rename src/main/resources/assets/forestry/models/block/arboriculture/{stairs/acacia.json => stairs.json} (79%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json rename src/main/resources/assets/forestry/models/block/arboriculture/{stairs/acacia_inner.json => stairs_inner.json} (79%) rename src/main/resources/assets/forestry/models/block/arboriculture/{stairs/acacia_outer.json => stairs_outer.json} (79%) create mode 100644 src/main/resources/assets/forestry/models/item/door.json create mode 100644 src/main/resources/assets/forestry/models/item/fence.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/acacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/larch.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/lime.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/palm.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/pine.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/plum.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/teak.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence/zebrawood.json rename src/main/resources/assets/forestry/models/item/{fence_gate/ipe.json => fence_gate.json} (87%) delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/acacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/larch.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/lime.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/palm.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/pine.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/plum.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/teak.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/fence_gate/zebrawood.json rename src/main/resources/assets/forestry/models/item/{planks/ipe.json => log.json} (77%) delete mode 100644 src/main/resources/assets/forestry/models/item/planks/acacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/larch.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/palm.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/pine.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/plum.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/teak.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/planks/zebrawood.json rename src/main/resources/assets/forestry/models/item/{planks/lime.json => slab.json} (77%) delete mode 100644 src/main/resources/assets/forestry/models/item/slab/acacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/larch.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/lime.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/palm.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/pine.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/plum.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/teak.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/slab/zebrawood.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/acacia.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/balsa.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/baobab.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/cherry.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/chestnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/citrus.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/cocobolo.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/ebony.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/giganteum.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/greenheart.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/ipe.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/kapok.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/larch.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/lime.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/mahoe.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/mahogany.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/maple.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/padauk.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/palm.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/papaya.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/pine.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/plum.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/poplar.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/sequoia.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/teak.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/walnut.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/wenge.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/willow.json delete mode 100644 src/main/resources/assets/forestry/models/item/stairs/zebrawood.json diff --git a/src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java b/src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java index b084d7e51f..2a85173368 100644 --- a/src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java +++ b/src/main/java/forestry/api/arboriculture/EnumForestryWoodType.java @@ -101,4 +101,29 @@ public int getCarbonization() { public int getCombustability() { return combustability; } + + @Override + public String getPlankTexture() { + return "forestry:blocks/wood/planks." + getName(); + } + + @Override + public String getDoorLowerTexture() { + return "forestry:blocks/doors/" + getName() + "_lower"; + } + + @Override + public String getDoorUpperTexture() { + return "forestry:blocks/doors/" + getName() + "_upper"; + } + + @Override + public String getBarkTexture() { + return "forestry:blocks/wood/bark." + getName(); + } + + @Override + public String getHeartTexture() { + return "forestry:blocks/wood/heart." + getName(); + } } diff --git a/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java b/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java index 4e34dfaeff..072d39858f 100644 --- a/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java +++ b/src/main/java/forestry/api/arboriculture/EnumVanillaWoodType.java @@ -71,4 +71,44 @@ public int getCarbonization() { public int getCombustability() { return combustability; } + + @Override + public String getPlankTexture() { + if(this == DARK_OAK){ + return "blocks/planks_big_oak"; + } + return "blocks/planks_" + getName(); + } + + @Override + public String getDoorLowerTexture() { + if(this == OAK){ + return "blocks/door_wood_lower"; + } + return "blocks/door_wood_lower"; + } + + @Override + public String getDoorUpperTexture() { + if(this == OAK){ + return "blocks/door_wood_upper"; + } + return "blocks/door_" + getName() + "_upper"; + } + + @Override + public String getBarkTexture() { + if(this == DARK_OAK){ + return "blocks/log_big_oak"; + } + return "blocks/log_" + getName(); + } + + @Override + public String getHeartTexture() { + if(this == DARK_OAK){ + return "blocks/log_big_oak_top"; + } + return "blocks/log_" + getName() + "_top"; + } } diff --git a/src/main/java/forestry/api/arboriculture/IWoodAccess.java b/src/main/java/forestry/api/arboriculture/IWoodAccess.java index 51cd9c4cab..11a59ad9d5 100644 --- a/src/main/java/forestry/api/arboriculture/IWoodAccess.java +++ b/src/main/java/forestry/api/arboriculture/IWoodAccess.java @@ -5,6 +5,8 @@ ******************************************************************************/ package forestry.api.arboriculture; +import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; @@ -22,5 +24,7 @@ public interface IWoodAccess { ItemStack getStack(IWoodType woodType, WoodBlockKind kind, boolean fireproof); IBlockState getBlock(IWoodType woodType, WoodBlockKind kind, boolean fireproof); + + List getRegisteredWoodTypes(); } diff --git a/src/main/java/forestry/api/arboriculture/IWoodItemMeshDefinition.java b/src/main/java/forestry/api/arboriculture/IWoodItemMeshDefinition.java new file mode 100644 index 0000000000..089a10a5a8 --- /dev/null +++ b/src/main/java/forestry/api/arboriculture/IWoodItemMeshDefinition.java @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.arboriculture; + +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public interface IWoodItemMeshDefinition extends ItemMeshDefinition { + + ResourceLocation getDefaultModelLocation(ItemStack stack); + +} diff --git a/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java b/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java new file mode 100644 index 0000000000..ff8d7e2c6d --- /dev/null +++ b/src/main/java/forestry/api/arboriculture/IWoodStateMapper.java @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright 2011-2014 SirSengir + * + * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. + ******************************************************************************/ +package forestry.api.arboriculture; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public interface IWoodStateMapper extends IStateMapper { + + ModelResourceLocation getModelResourceLocation(IBlockState state); + + ModelResourceLocation getDefaultModelResourceLocation(IBlockState state); + +} diff --git a/src/main/java/forestry/api/arboriculture/IWoodType.java b/src/main/java/forestry/api/arboriculture/IWoodType.java index 972c3b19c2..4e701b0f0a 100644 --- a/src/main/java/forestry/api/arboriculture/IWoodType.java +++ b/src/main/java/forestry/api/arboriculture/IWoodType.java @@ -14,4 +14,14 @@ public interface IWoodType extends IStringSerializable { int getCarbonization(); int getCombustability(); + + String getPlankTexture(); + + String getDoorLowerTexture(); + + String getDoorUpperTexture(); + + String getBarkTexture(); + + String getHeartTexture(); } diff --git a/src/main/java/forestry/api/arboriculture/WoodBlockKind.java b/src/main/java/forestry/api/arboriculture/WoodBlockKind.java index 5a5d24f0b7..db91d0cb19 100644 --- a/src/main/java/forestry/api/arboriculture/WoodBlockKind.java +++ b/src/main/java/forestry/api/arboriculture/WoodBlockKind.java @@ -2,11 +2,65 @@ import java.util.Locale; +import com.google.common.collect.ImmutableMap; + +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelProcessingHelper; + public enum WoodBlockKind { - LOG, PLANKS, SLAB, FENCE, FENCE_GATE, STAIRS, DOOR; + LOG, PLANKS, SLAB, FENCE, FENCE_GATE, STAIRS, DOOR(false); + public final boolean retextureItem; + + private WoodBlockKind() { + this(true); + } + + private WoodBlockKind(boolean retextureItem) { + this.retextureItem = retextureItem; + } + @Override public String toString() { return super.toString().toLowerCase(Locale.ENGLISH); } + + public IModel retextureModel(IModel model, IWoodType type){ + ImmutableMap.Builder textures = new ImmutableMap.Builder(); + switch (this) { + case SLAB: + case STAIRS: + String textureLocation = type.getPlankTexture(); + textures.put("particle", textureLocation); + textures.put("side", textureLocation); + textures.put("top", textureLocation); + textures.put("bottom", textureLocation); + textures.put("all", textureLocation); + break; + case PLANKS: + textures.put("particle", type.getPlankTexture()); + textures.put("all", type.getPlankTexture()); + break; + case FENCE_GATE: + case FENCE: + textures.put("particle", type.getPlankTexture()); + textures.put("side", type.getPlankTexture()); + textures.put("texture", type.getPlankTexture()); + break; + case DOOR: + textures.put("particle", type.getDoorLowerTexture()); + textures.put("bottom", type.getDoorLowerTexture()); + textures.put("top", type.getDoorUpperTexture()); + break; + case LOG: + textures.put("particle", type.getBarkTexture()); + textures.put("side", type.getBarkTexture()); + textures.put("all", type.getBarkTexture()); + textures.put("end", type.getHeartTexture()); + break; + default: + break; + } + return ModelProcessingHelper.retexture(model, textures.build()); + } } diff --git a/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java b/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java index aaf6a408b2..cdb149d71f 100644 --- a/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java +++ b/src/main/java/forestry/arboriculture/CamouflageHandlerArbDoor.java @@ -25,6 +25,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.tuple.Pair; public class CamouflageHandlerArbDoor implements ICamouflageItemHandler { @@ -51,7 +52,7 @@ public float getLightTransmittance(ItemStack stack, ICamouflageHandler camouflag @SideOnly(Side.CLIENT) @Override - public IBakedModel getModel(ItemStack stack, ICamouflageHandler camouflageHandler, ICamouflagedTile camouflageTile) { + public Pair getModel(ItemStack stack, ICamouflageHandler camouflageHandler, ICamouflagedTile camouflageTile) { if(camouflageHandler == null || stack == null || stack.getItem() == null || stack.stackSize <= 0 || !(stack.getItem() instanceof ItemBlockWoodDoor)){ return null; } @@ -71,7 +72,7 @@ public IBakedModel getModel(ItemStack stack, ICamouflageHandler camouflageHandle BlockModelShapes modelShapes = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes(); - return modelShapes.getModelForState(doorState); + return Pair.of(doorState, modelShapes.getModelForState(doorState)); } } diff --git a/src/main/java/forestry/arboriculture/IWoodTyped.java b/src/main/java/forestry/arboriculture/IWoodTyped.java index 1ec1648f59..d3b13f19c7 100755 --- a/src/main/java/forestry/arboriculture/IWoodTyped.java +++ b/src/main/java/forestry/arboriculture/IWoodTyped.java @@ -11,8 +11,8 @@ package forestry.arboriculture; import javax.annotation.Nonnull; -import java.util.Collection; +import java.util.Collection; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.WoodBlockKind; diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 48ed45137d..19aedf573c 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -56,6 +56,7 @@ import forestry.arboriculture.models.TextureLeaves; import forestry.arboriculture.network.PacketRegistryArboriculture; import forestry.arboriculture.proxy.ProxyArboriculture; +import forestry.arboriculture.proxy.ProxyArboricultureClient; import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TilePile; @@ -68,6 +69,7 @@ import forestry.core.items.ItemFruit.EnumFruit; import forestry.core.network.IPacketRegistry; import forestry.core.recipes.RecipeUtil; +import forestry.core.render.TextureManager; import forestry.core.utils.IMCUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.OreDictUtil; @@ -88,7 +90,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; @@ -554,6 +558,24 @@ public void registerSprites(TextureStitchEvent.Pre event) { for (IAlleleFruit alleleFruit : AlleleFruit.getFruitAlleles()) { alleleFruit.getProvider().registerSprites(); } + List textures = new ArrayList<>(); + for(IWoodType type : TreeManager.woodAccess.getRegisteredWoodTypes()){ + textures.add(new ResourceLocation(type.getHeartTexture())); + textures.add(new ResourceLocation(type.getBarkTexture())); + textures.add(new ResourceLocation(type.getDoorLowerTexture())); + textures.add(new ResourceLocation(type.getDoorUpperTexture())); + textures.add(new ResourceLocation(type.getPlankTexture())); + } + for(ResourceLocation loc : textures){ + TextureManager.getInstance(); + TextureManager.registerSprite(loc); + } + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent event) { + ((ProxyArboricultureClient)proxy).onModelBake(event); } @SubscribeEvent diff --git a/src/main/java/forestry/arboriculture/WoodAccess.java b/src/main/java/forestry/arboriculture/WoodAccess.java index 369b7e291e..6a721bae9a 100644 --- a/src/main/java/forestry/arboriculture/WoodAccess.java +++ b/src/main/java/forestry/arboriculture/WoodAccess.java @@ -11,6 +11,8 @@ package forestry.arboriculture; import javax.annotation.Nonnull; + +import java.util.ArrayList; import java.util.Arrays; import java.util.EnumMap; import java.util.HashMap; @@ -43,6 +45,7 @@ public class WoodAccess implements IWoodAccess { private static final Map woodMaps = new EnumMap<>(WoodBlockKind.class); + private static final List registeredWoodTypes = new ArrayList<>(); static { for (WoodBlockKind woodBlockKind : WoodBlockKind.values()) { @@ -195,6 +198,9 @@ private static & IWoodType> voi int meta = woodTyped.getMetaFromState(blockState); IWoodType woodType = woodTyped.getWoodType(meta); ItemStack itemStack = new ItemStack(woodTyped, 1, meta); + if(!(woodType instanceof EnumVanillaWoodType)){ + PluginArboriculture.proxy.registerWoodModel(woodTyped, true); + } register(woodType, woodBlockKind, fireproof, blockState, itemStack); } } @@ -207,6 +213,9 @@ private static void registerWithoutVariants(T woo IBlockState blockState = woodTyped.getDefaultState(); IWoodType woodType = woodTyped.getWoodType(0); ItemStack itemStack = new ItemStack(woodTyped); + if(!(woodType instanceof EnumVanillaWoodType)){ + PluginArboriculture.proxy.registerWoodModel(woodTyped, false); + } register(woodType, woodBlockKind, fireproof, blockState, itemStack); } @@ -218,6 +227,9 @@ private static void register(IWoodType woodType, WoodBlockKind woodBlockKind, bo throw new NullPointerException("Invalid itemStack: " + itemStack); } WoodMap woodMap = woodMaps.get(woodBlockKind); + if(!registeredWoodTypes.contains(woodType)){ + registeredWoodTypes.add(woodType); + } woodMap.getItem(fireproof).put(woodType, itemStack); woodMap.getBlock(fireproof).put(woodType, blockState); } @@ -249,4 +261,9 @@ public IBlockState getBlock(IWoodType woodType, WoodBlockKind woodBlockKind, boo } return blockState; } + + @Override + public List getRegisteredWoodTypes() { + return registeredWoodTypes; + } } diff --git a/src/main/java/forestry/arboriculture/WoodHelper.java b/src/main/java/forestry/arboriculture/WoodHelper.java index d496c0a169..f10b4eb777 100644 --- a/src/main/java/forestry/arboriculture/WoodHelper.java +++ b/src/main/java/forestry/arboriculture/WoodHelper.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -14,10 +13,12 @@ import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodItemMeshDefinition; import forestry.api.arboriculture.IWoodType; import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.ForestryAPI; +import forestry.arboriculture.models.WoodModelLoader; import forestry.core.config.Constants; import forestry.core.utils.Translator; @@ -50,6 +51,10 @@ public static String getDisplayName(IWoodTyped wood, IWoodType woodType) { return displayName; } + + public static ResourceLocation getDefaultResourceLocations(IWoodTyped typed) { + return new ResourceLocation(Constants.MOD_ID, typed.getBlockKind().toString()); + } public static ResourceLocation[] getResourceLocations(IWoodTyped typed) { List resourceLocations = new ArrayList<>(); @@ -65,7 +70,7 @@ public static ResourceLocation[] getResourceLocations(IWoodTyped typed) { } @SideOnly(Side.CLIENT) - public static class WoodMeshDefinition implements ItemMeshDefinition { + public static class WoodMeshDefinition implements IWoodItemMeshDefinition { @Nonnull public IWoodTyped wood; @@ -75,6 +80,9 @@ public WoodMeshDefinition(@Nonnull IWoodTyped wood) { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { + if(!WoodModelLoader.INSTANCE.isRegistered){ + return new ModelResourceLocation(getDefaultModelLocation(stack), "inventory"); + } int meta = stack.getMetadata(); IWoodType woodType = wood.getWoodType(meta); WoodBlockKind blockKind = wood.getBlockKind(); @@ -86,6 +94,12 @@ public ModelResourceLocation getModelLocation(ItemStack stack) { throw new IllegalArgumentException("Unknown wood type: " + woodType); } } + + @Override + public ResourceLocation getDefaultModelLocation(ItemStack stack) { + WoodBlockKind blockKind = wood.getBlockKind(); + return new ResourceLocation("forestry:item/" + blockKind.toString()); + } } } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java index 91acf5322f..d8720f1419 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java @@ -119,7 +119,7 @@ public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos po @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this)); manager.registerItemModel(item, new WoodMeshDefinition(this)); } } \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java index cb0fc673ea..5bbed48783 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java @@ -42,7 +42,7 @@ public BlockForestryStairs(boolean fireproof, IBlockState modelState, T woodType @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java index f3a66e6600..55d8a15f41 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java @@ -15,19 +15,19 @@ import net.minecraft.block.state.IBlockState; 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.EnumForestryWoodType; import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IWoodStateMapper; import forestry.api.arboriculture.IWoodType; import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.blocks.property.PropertyWoodType; +import forestry.arboriculture.models.WoodModelLoader; import forestry.core.config.Constants; @SideOnly(Side.CLIENT) -public class WoodTypeStateMapper extends StateMapperBase { +public class WoodTypeStateMapper extends StateMapperBase implements IWoodStateMapper { @Nonnull private final IWoodTyped woodTyped; @@ -56,7 +56,7 @@ public WoodTypeStateMapper addPropertyToRemove(IProperty property){ } @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + public ModelResourceLocation getModelResourceLocation(IBlockState state) { final Map, Comparable> properties; if (propertyWoodType != null) { properties = Maps.newLinkedHashMap(state.getProperties()); @@ -73,11 +73,34 @@ protected ModelResourceLocation getModelResourceLocation(IBlockState state) { int meta = block.getMetaFromState(state); IWoodType woodType = woodTyped.getWoodType(meta); if (woodType instanceof EnumForestryWoodType) { - return getForestryModelResourceLocation(woodType, properties); + if(WoodModelLoader.INSTANCE.isRegistered){ + return getForestryModelResourceLocation(woodType, properties); + }else{ + return getDefaultModelResourceLocation(state); + } } else { return getVanillaModelResourceLocation(block, woodType, properties); } } + + @Override + public ModelResourceLocation getDefaultModelResourceLocation(IBlockState state) { + final Map, Comparable> properties; + if (propertyWoodType != null) { + properties = Maps.newLinkedHashMap(state.getProperties()); + properties.remove(propertyWoodType); + } else { + properties = Maps.newLinkedHashMap(state.getProperties()); + } + + for (IProperty property : propertiesToRemove) { + properties.remove(property); + } + + String resourceLocation = "arboriculture/" + blockPath; + String propertyString = this.getPropertyString(properties); + return new ModelResourceLocation(Constants.MOD_ID + ':' + resourceLocation, propertyString); + } private ModelResourceLocation getForestryModelResourceLocation(IWoodType woodType, Map, Comparable> properties) { String resourceLocation = "arboriculture/" + blockPath + '/' + woodType; diff --git a/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java index f45c617442..aec9cb5952 100644 --- a/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java @@ -104,7 +104,7 @@ public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java index 39b44c172f..0e3b8aa762 100644 --- a/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java @@ -181,7 +181,7 @@ public final int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing fa @SideOnly(Side.CLIENT) @Override public final void registerModel(Item item, IModelManager manager) { - ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java index f702b1d3be..7f248d0ddf 100644 --- a/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java @@ -121,7 +121,7 @@ public void getSubBlocks(Item item, CreativeTabs tab, List list) { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java index 0e05b81bc7..3444280a53 100644 --- a/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java @@ -133,7 +133,7 @@ public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getDefaultResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/models/ModelWoodPile.java b/src/main/java/forestry/arboriculture/models/ModelWoodPile.java index 2a6364e2c8..629229eaf7 100644 --- a/src/main/java/forestry/arboriculture/models/ModelWoodPile.java +++ b/src/main/java/forestry/arboriculture/models/ModelWoodPile.java @@ -14,7 +14,7 @@ import forestry.arboriculture.tiles.TilePile; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; -import forestry.core.models.BlankItemModel; +import forestry.core.models.BlankModel; import forestry.core.models.DefaultTextureGetter; import forestry.core.tiles.TileUtil; import net.minecraft.block.state.IBlockState; @@ -38,7 +38,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ModelWoodPile extends BlankItemModel{ +public class ModelWoodPile extends BlankModel{ private final Function textureGetter = new DefaultTextureGetter(); @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/arboriculture/models/WoodModelLoader.java b/src/main/java/forestry/arboriculture/models/WoodModelLoader.java new file mode 100644 index 0000000000..4525183cf7 --- /dev/null +++ b/src/main/java/forestry/arboriculture/models/WoodModelLoader.java @@ -0,0 +1,296 @@ +package forestry.arboriculture.models; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.tuple.Pair; + +import com.google.common.base.Charsets; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + +import forestry.core.config.Constants; +import forestry.core.utils.Log; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelBlockDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.Variant; +import net.minecraft.client.renderer.block.model.VariantList; +import net.minecraft.client.renderer.block.model.WeightedBakedModel; +import net.minecraft.client.renderer.block.model.ModelBlockDefinition.MissingVariantException; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.IResource; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.ICustomModelLoader; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IRetexturableModel; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.client.model.ModelProcessingHelper; +import net.minecraftforge.client.model.MultiModel; +import net.minecraftforge.client.model.MultiModelState; +import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.model.TRSRTransformation; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; + +public enum WoodModelLoader implements ICustomModelLoader{ + INSTANCE; + + public static Map loadingExceptions = Maps.newHashMap(); + private final Map blockDefinitions = Maps.newHashMap(); + public static final List validFiles = new ArrayList<>(); + public boolean isRegistered = false; + + static{ + validFiles.add("door"); + validFiles.add("double_slab"); + validFiles.add("fence"); + validFiles.add("fence_gate"); + validFiles.add("log"); + validFiles.add("planks"); + validFiles.add("slab"); + validFiles.add("stairs"); + } + + // NOOP, handled in loader + @Override + public void onResourceManagerReload(IResourceManager resourceManager) {} + + @Override + public boolean accepts(ResourceLocation modelLocation){ + if(!(modelLocation instanceof ModelResourceLocation) || !modelLocation.getResourceDomain().equals(Constants.MOD_ID) || !modelLocation.getResourcePath().contains("arboriculture")){ + return false; + } + String path = modelLocation.getResourcePath(); + for(String validFile : validFiles){ + if(path.endsWith(validFile)){ + return true; + } + } + return false; + } + + @Override + public IModel loadModel(ResourceLocation modelLocation) throws Exception{ + ModelResourceLocation variant = (ModelResourceLocation) modelLocation; + ModelBlockDefinition definition = getModelBlockDefinition(variant); + try{ + VariantList variants = definition.getVariant(variant.getVariant()); + return new WeightedRandomModel(variant, variants); + }catch(MissingVariantException e){ + if(definition.hasMultipartData()){ + Log.error("The forestry model loader can't load the model with the location: %s, because it dons't support multipart models.", modelLocation.toString()); + } + throw e; + } + } + + /* MODEL LOADER PRIVATE METHODS */ + private ModelBlockDefinition getModelBlockDefinition(ResourceLocation location){ + try{ + ResourceLocation resourcelocation = this.getBlockstateLocation(location); + ModelBlockDefinition modelblockdefinition = this.blockDefinitions.get(resourcelocation); + + if (modelblockdefinition == null){ + modelblockdefinition = this.loadMultipartMBD(location, resourcelocation); + this.blockDefinitions.put(resourcelocation, modelblockdefinition); + } + + return modelblockdefinition; + } + catch (Exception exception){ + loadingExceptions.put(location, new Exception("Could not load model definition for variant " + location, exception)); + } + return new ModelBlockDefinition(new ArrayList()); + } + + private ResourceLocation getBlockstateLocation(ResourceLocation location){ + return new ResourceLocation(location.getResourceDomain(), "blockstates/" + location.getResourcePath() + ".json"); + } + + private ModelBlockDefinition loadMultipartMBD(ResourceLocation location, ResourceLocation fileIn){ + List list = Lists.newArrayList(); + + try{ + for (IResource iresource : Minecraft.getMinecraft().getResourceManager().getAllResources(fileIn)){ + list.add(this.loadModelBlockDefinition(location, iresource)); + } + }catch (IOException ioexception){ + throw new RuntimeException("Encountered an exception when loading model definition of model " + fileIn, ioexception); + } + + return new ModelBlockDefinition(list); + } + + private ModelBlockDefinition loadModelBlockDefinition(ResourceLocation location, IResource iresource){ + InputStream inputstream = null; + ModelBlockDefinition definition; + + try{ + inputstream = iresource.getInputStream(); + definition = ModelBlockDefinition.parseFromReader(new InputStreamReader(inputstream, Charsets.UTF_8)); + }catch (Exception exception){ + throw new RuntimeException("Encountered an exception when loading model definition of \'" + location + "\' from: \'" + iresource.getResourceLocation() + "\' in resourcepack: \'" + iresource.getResourcePackName() + "\'", exception); + }finally{ + IOUtils.closeQuietly(inputstream); + } + + return definition; + } + + private class WeightedRandomModel implements IRetexturableModel { + private final List variants; + private final List locations = new ArrayList(); + private final Set textures = Sets.newHashSet(); + private final List models = new ArrayList(); + private final IModelState defaultState; + + public WeightedRandomModel(List locations, List models, List variants, IModelState defaultState){ + this.locations.addAll(locations); + this.models.addAll(models); + this.variants = variants; + this.defaultState = defaultState; + for(IModel model : models){ + textures.addAll(model.getTextures()); + } + } + + public WeightedRandomModel(ResourceLocation parent, VariantList variants) throws Exception{ + this.variants = variants.getVariantList(); + ImmutableList.Builder> builder = ImmutableList.builder(); + for (Variant v : this.variants){ + ResourceLocation loc = v.getModelLocation(); + locations.add(loc); + + /* + * Vanilla eats this, which makes it only show variants that have models. + * But that doesn't help debugging, so throw the exception + */ + IModel model; + if(loc.equals(new ModelResourceLocation("builtin/missing", "missing"))){ + // explicit missing location, happens if blockstate has "model"=null + model = ModelLoaderRegistry.getMissingModel(); + }else{ + model = ModelLoaderRegistry.getModel(loc); + } + + // FIXME: is this the place? messes up dependency and texture resolution + model = v.process(model); + for(ResourceLocation location : model.getDependencies()){ + ModelLoaderRegistry.getModelOrMissing(location); + } + //FMLLog.getLogger().error("Exception resolving indirect dependencies for model" + loc, e); + textures.addAll(model.getTextures()); // Kick this, just in case. + + models.add(model); + builder.add(Pair.of(model, v.getState())); + } + + if (models.size() == 0){ //If all variants are missing, add one with the missing model and default rotation. + // FIXME: log this? + IModel missing = ModelLoaderRegistry.getMissingModel(); + models.add(missing); + builder.add(Pair.of(missing, TRSRTransformation.identity())); + } + + defaultState = new MultiModelState(builder.build()); + } + + @Override + public Collection getDependencies(){ + return ImmutableList.copyOf(locations); + } + + @Override + public Collection getTextures(){ + return ImmutableSet.copyOf(textures); + } + + @Override + public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter){ + if(!Attributes.moreSpecific(format, Attributes.DEFAULT_BAKED_FORMAT)){ + throw new IllegalArgumentException("can't bake vanilla weighted models to the format that doesn't fit into the default one: " + format); + } + if(variants.size() == 1){ + IModel model = models.get(0); + return model.bake(MultiModelState.getPartState(state, model, 0), format, bakedTextureGetter); + } + WeightedBakedModel.Builder builder = new WeightedBakedModel.Builder(); + for(int i = 0; i < variants.size(); i++){ + IModel model = models.get(i); + builder.add(model.bake(MultiModelState.getPartState(state, model, i), format, bakedTextureGetter), variants.get(i).getWeight()); + } + return builder.build(); + } + + @Override + public IModelState getDefaultState(){ + return defaultState; + } + + @Override + public IModel retexture(ImmutableMap textures) { + List models = new ArrayList(); + ImmutableList.Builder> builder = ImmutableList.builder(); + for (Variant v : this.variants){ + try{ + ResourceLocation loc = v.getModelLocation(); + locations.add(loc); + + IModel model; + if(loc.equals(new ModelResourceLocation("builtin/missing", "missing"))){ + model = ModelLoaderRegistry.getMissingModel(); + }else{ + model = ModelLoaderRegistry.getModel(loc); + } + + model = v.process(model); + for(ResourceLocation location : model.getDependencies()){ + ModelLoaderRegistry.getModelOrMissing(location); + } + + if(model instanceof MultiModel){ + IModel base = ObfuscationReflectionHelper.getPrivateValue(MultiModel.class, (MultiModel)model, 1); + Map> parts = ObfuscationReflectionHelper.getPrivateValue(MultiModel.class, (MultiModel)model, 3); + + ImmutableMap.Builder> partBuilder = new ImmutableMap.Builder<>(); + IModel retexturedModel = ModelProcessingHelper.retexture(base, textures); + for(Entry> part : parts.entrySet()){ + partBuilder.put(part.getKey(), Pair.of(ModelProcessingHelper.retexture(part.getValue().getLeft(), textures), part.getValue().getRight())); + } + + ObfuscationReflectionHelper.setPrivateValue(MultiModel.class, (MultiModel)model, retexturedModel, 1); + ObfuscationReflectionHelper.setPrivateValue(MultiModel.class, (MultiModel)model, partBuilder.build(), 3); + } + model = ModelProcessingHelper.retexture(model, textures); + + models.add(model); + builder.add(Pair.of(model, v.getState())); + }catch(Exception e){} + } + + if (models.size() == 0){ + IModel missing = ModelLoaderRegistry.getMissingModel(); + models.add(missing); + builder.add(Pair.of(missing, TRSRTransformation.identity())); + } + return new WeightedRandomModel(locations, models, variants, new MultiModelState(builder.build())); + } + } +} diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java index ecf9541cef..8a7ec327fa 100755 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java @@ -10,6 +10,10 @@ ******************************************************************************/ package forestry.arboriculture.proxy; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.arboriculture.IWoodTyped; +import net.minecraft.block.Block; + public class ProxyArboriculture { public void initializeModels() { @@ -26,5 +30,7 @@ public int getFoliageColorBirch() { public int getFoliageColorPine() { return 6396257; } - + + public void registerWoodModel(T woodTyped, boolean withVariants){ + } } diff --git a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java index 1e1222e72b..1a430c0178 100644 --- a/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboricultureClient.java @@ -10,28 +10,63 @@ ******************************************************************************/ package forestry.arboriculture.proxy; +import net.minecraft.block.Block; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.ItemModelMesher; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.BlockStateMapper; +import net.minecraft.client.renderer.block.statemap.IStateMapper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.IRegistry; import net.minecraft.world.ColorizerFoliage; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import forestry.api.arboriculture.EnumPileType; +import forestry.api.arboriculture.IWoodItemMeshDefinition; +import forestry.api.arboriculture.IWoodStateMapper; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.WoodBlockKind; +import forestry.arboriculture.IWoodTyped; import forestry.arboriculture.PluginArboriculture; +import forestry.arboriculture.WoodAccess; import forestry.arboriculture.blocks.BlockDecorativeLeaves; +import forestry.arboriculture.blocks.slab.BlockArbSlab; import forestry.arboriculture.models.ModelDecorativeLeaves; import forestry.arboriculture.models.ModelLeaves; import forestry.arboriculture.models.ModelWoodPile; +import forestry.arboriculture.models.WoodModelLoader; import forestry.arboriculture.render.CharcoalPileRenderer; import forestry.arboriculture.tiles.TilePile; -import forestry.core.models.BlockModelIndex; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.SimpleRetexturedModel; +import forestry.core.models.WoodModelEntry; import forestry.core.proxy.Proxies; -@SuppressWarnings("unused") public class ProxyArboricultureClient extends ProxyArboriculture { + private static Set woodModelEntrys = new HashSet<>(); + @Override public void initializeModels() { { ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:leaves"); ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:leaves", "inventory"); - BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelLeaves(), PluginArboriculture.blocks.leaves); + BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelLeaves(), PluginArboriculture.blocks.leaves); Proxies.render.registerBlockModel(blockModelIndex); } @@ -39,17 +74,88 @@ public void initializeModels() { String resourceName = "forestry:leaves.decorative." + leaves.getBlockNumber(); ModelResourceLocation blockModelLocation = new ModelResourceLocation(resourceName); ModelResourceLocation itemModeLocation = new ModelResourceLocation(resourceName, "inventory"); - BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModeLocation, new ModelDecorativeLeaves(), leaves); + BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModeLocation, new ModelDecorativeLeaves(), leaves); Proxies.render.registerBlockModel(blockModelIndex); } { ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:pile", "type=wood"); ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:woodPile", "inventory"); - BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelWoodPile(), PluginArboriculture.blocks.piles.get(EnumPileType.WOOD)); + BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelWoodPile(), PluginArboriculture.blocks.piles.get(EnumPileType.WOOD)); Proxies.render.registerBlockModel(blockModelIndex); } + ClientRegistry.bindTileEntitySpecialRenderer(TilePile.class, new CharcoalPileRenderer()); + ModelLoaderRegistry.registerLoader(WoodModelLoader.INSTANCE); + for(BlockArbSlab slab : PluginArboriculture.blocks.slabsDouble){ + registerWoodModel(slab, true); + } + for(BlockArbSlab slab : PluginArboriculture.blocks.slabsDoubleFireproof){ + registerWoodModel(slab, true); + } + } + + @SubscribeEvent + public void onModelBake(ModelBakeEvent event){ + WoodModelLoader.INSTANCE.isRegistered = true; + IRegistry registry = event.getModelRegistry(); + Minecraft minecraft = Proxies.common.getClientInstance(); + Map loadingExceptions = ObfuscationReflectionHelper.getPrivateValue(ModelLoader.class, event.getModelLoader(), 2); + + if(minecraft.getBlockRendererDispatcher() != null){ + BlockStateMapper stateMapper = minecraft.getBlockRendererDispatcher().getBlockModelShapes().getBlockStateMapper(); + Map definitions = ObfuscationReflectionHelper.getPrivateValue(ItemModelMesher.class, minecraft.getRenderItem().getItemModelMesher(), 2); + Map blockStateMap = ObfuscationReflectionHelper.getPrivateValue(BlockStateMapper.class, stateMapper, 0); + + for(WoodModelEntry entry : woodModelEntrys){ + T woodTyped = entry.woodTyped; + WoodBlockKind woodKind = woodTyped.getBlockKind(); + + IStateMapper mapper = blockStateMap.get(woodTyped); + if(mapper instanceof IWoodStateMapper){ + IWoodStateMapper woodMapper = (IWoodStateMapper) mapper; + try{ + for(IBlockState state : woodTyped.getBlockState().getValidStates()) { + IWoodType woodType; + ItemStack itemStack; + if(entry.withVariants){ + int meta = woodTyped.getMetaFromState(state); + woodType = woodTyped.getWoodType(meta); + itemStack = new ItemStack(woodTyped, 1, meta); + }else{ + woodType = woodTyped.getWoodType(0); + itemStack = new ItemStack(woodTyped); + } + if(woodKind.retextureItem){ + ItemMeshDefinition definition = definitions.get(itemStack.getItem()); + if(definition instanceof IWoodItemMeshDefinition){ + IWoodItemMeshDefinition woodDefinition = (IWoodItemMeshDefinition) definition; + IModel basicItemModel = ModelLoaderRegistry.getModel(woodDefinition.getDefaultModelLocation(itemStack)); + ModelResourceLocation basicItemLocation = definition.getModelLocation(itemStack); + + registry.putObject(basicItemLocation, new SimpleRetexturedModel(woodKind.retextureModel(basicItemModel, woodType))); + } + } + IModel basicModel = ModelLoaderRegistry.getModel(woodMapper.getDefaultModelResourceLocation(state)); + ModelResourceLocation basicLocation = woodMapper.getModelResourceLocation(state); + if(loadingExceptions.containsKey(basicLocation)){ + loadingExceptions.remove(basicLocation); + } + registry.putObject(basicLocation, new SimpleRetexturedModel(woodKind.retextureModel(basicModel, woodType))); + } + }catch(Exception e){ + e.printStackTrace(); + } + } + } + } + + loadingExceptions.putAll(WoodModelLoader.loadingExceptions); + } + + @Override + public void registerWoodModel(T woodTyped, boolean withVariants){ + woodModelEntrys.add(new WoodModelEntry(woodTyped, withVariants)); } @Override diff --git a/src/main/java/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java index 200d2d1e7c..cd19309210 100755 --- a/src/main/java/forestry/core/items/ItemForestryTool.java +++ b/src/main/java/forestry/core/items/ItemForestryTool.java @@ -17,9 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; -import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; diff --git a/src/main/java/forestry/core/models/BlankItemModel.java b/src/main/java/forestry/core/models/BlankModel.java similarity index 96% rename from src/main/java/forestry/core/models/BlankItemModel.java rename to src/main/java/forestry/core/models/BlankModel.java index 1220924385..da50e415ad 100644 --- a/src/main/java/forestry/core/models/BlankItemModel.java +++ b/src/main/java/forestry/core/models/BlankModel.java @@ -24,7 +24,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public abstract class BlankItemModel implements IBakedModel { +public abstract class BlankModel implements IBakedModel { protected ItemOverrideList overrideList; @Override @@ -46,7 +46,7 @@ public ItemOverrideList getOverrides() { @Override public boolean isAmbientOcclusion() { - return false; + return true; } @Override diff --git a/src/main/java/forestry/core/models/BlockModelIndex.java b/src/main/java/forestry/core/models/BlockModelEntry.java similarity index 89% rename from src/main/java/forestry/core/models/BlockModelIndex.java rename to src/main/java/forestry/core/models/BlockModelEntry.java index 4dbed4bbeb..f99060844d 100644 --- a/src/main/java/forestry/core/models/BlockModelIndex.java +++ b/src/main/java/forestry/core/models/BlockModelEntry.java @@ -14,7 +14,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -public class BlockModelIndex { +public class BlockModelEntry { public final ModelResourceLocation blockModelLocation; public final ModelResourceLocation itemModelLocation; @@ -22,11 +22,11 @@ public class BlockModelIndex { public final boolean addStateMapper; public final Block block; - public BlockModelIndex(ModelResourceLocation blockModelLocation, ModelResourceLocation itemModelLocation, IBakedModel model, Block block) { + public BlockModelEntry(ModelResourceLocation blockModelLocation, ModelResourceLocation itemModelLocation, IBakedModel model, Block block) { this(blockModelLocation, itemModelLocation, model, block, true); } - public BlockModelIndex(ModelResourceLocation blockModelLocation, ModelResourceLocation itemModelLocation, IBakedModel model, Block block, boolean addStateMapper) { + public BlockModelEntry(ModelResourceLocation blockModelLocation, ModelResourceLocation itemModelLocation, IBakedModel model, Block block, boolean addStateMapper) { this.blockModelLocation = blockModelLocation; this.itemModelLocation = itemModelLocation; this.model = model; diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index bba0be0655..ab320522f3 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -58,7 +58,7 @@ import gnu.trove.map.hash.TIntObjectHashMap; @SideOnly(Side.CLIENT) -public class ModelCrate extends BlankItemModel { +public class ModelCrate extends BlankModel { private static final Map cache = Maps.newHashMap(); private static final String CUSTOM_CRATES = "forestry:item/crates/"; @@ -251,7 +251,7 @@ public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, W } - private class CrateBakedModel extends BlankItemModel{ + private class CrateBakedModel extends BlankModel{ public final List models; diff --git a/src/main/java/forestry/core/models/ModelIndex.java b/src/main/java/forestry/core/models/ModelEntry.java similarity index 91% rename from src/main/java/forestry/core/models/ModelIndex.java rename to src/main/java/forestry/core/models/ModelEntry.java index 6271c93189..e3df7b83da 100644 --- a/src/main/java/forestry/core/models/ModelIndex.java +++ b/src/main/java/forestry/core/models/ModelEntry.java @@ -17,12 +17,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelIndex { +public class ModelEntry { public final ModelResourceLocation modelLocation; public final IBakedModel model; - public ModelIndex(ModelResourceLocation modelLocation, IBakedModel model) { + public ModelEntry(ModelResourceLocation modelLocation, IBakedModel model) { this.modelLocation = modelLocation; this.model = model; } diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java index e0f3c0bdcb..959d806e1b 100644 --- a/src/main/java/forestry/core/models/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -56,8 +56,8 @@ public class ModelManager implements IModelManager { private static final ModelManager instance = new ModelManager(); - private final List customBlockModels = new ArrayList<>(); - private final List customModels = new ArrayList<>(); + private final List customBlockModels = new ArrayList<>(); + private final List customModels = new ArrayList<>(); private final List itemModelRegisters = new ArrayList<>(); private final List stateMapperRegisters = new ArrayList<>(); @@ -258,23 +258,23 @@ public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos public void registerCustomModels(ModelBakeEvent event) { IRegistry registry = event.getModelRegistry(); - for (final BlockModelIndex index : customBlockModels) { - registry.putObject(index.blockModelLocation, index.model); - if(index.itemModelLocation != null){ - registry.putObject(index.itemModelLocation, index.model); + for (final BlockModelEntry entry : customBlockModels) { + registry.putObject(entry.blockModelLocation, entry.model); + if (entry.itemModelLocation != null) { + registry.putObject(entry.itemModelLocation, entry.model); } } - for (final ModelIndex index : customModels) { - registry.putObject(index.modelLocation, index.model); + for (final ModelEntry entry : customModels) { + registry.putObject(entry.modelLocation, entry.model); } } - public void registerCustomBlockModel(@Nonnull BlockModelIndex index) { + public void registerCustomBlockModel(@Nonnull BlockModelEntry index) { customBlockModels.add(index); } - public void registerCustomModel(@Nonnull ModelIndex index) { + public void registerCustomModel(@Nonnull ModelEntry index) { customModels.add(index); } diff --git a/src/main/java/forestry/core/models/SimpleRetexturedModel.java b/src/main/java/forestry/core/models/SimpleRetexturedModel.java new file mode 100644 index 0000000000..89a2aed3d6 --- /dev/null +++ b/src/main/java/forestry/core/models/SimpleRetexturedModel.java @@ -0,0 +1,61 @@ +package forestry.core.models; + +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; +import net.minecraftforge.client.model.IModel; + +public class SimpleRetexturedModel extends BlankModel { + + public final IModel model; + public IBakedModel bakedModel; + + public SimpleRetexturedModel(IModel model) { + this.model = model; + } + + @Override + public List getQuads(IBlockState state, EnumFacing side, long rand) { + if(bakedModel == null){ + bakedModel = model.bake(model.getDefaultState(), DefaultVertexFormats.BLOCK, new DefaultTextureGetter()); + } + return bakedModel.getQuads(state, side, rand); + } + + @Override + protected ItemOverrideList createOverrides() { + return new RetexturedOverrideList(model.bake(model.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter())); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return bakedModel.getParticleTexture(); + } + + private static class RetexturedOverrideList extends ItemOverrideList{ + public IBakedModel bakedModel; + + public RetexturedOverrideList(IBakedModel bakedModel) { + super(Collections.emptyList()); + + this.bakedModel = bakedModel; + } + + @Override + public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity) { + return bakedModel; + } + + } + +} diff --git a/src/main/java/forestry/core/models/WoodModelEntry.java b/src/main/java/forestry/core/models/WoodModelEntry.java new file mode 100644 index 0000000000..d4b87addc4 --- /dev/null +++ b/src/main/java/forestry/core/models/WoodModelEntry.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * 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.core.models; + +import forestry.api.arboriculture.WoodBlockKind; +import forestry.arboriculture.IWoodTyped; +import net.minecraft.block.Block; + +/** + * Only to storage data's to register a model later. + */ +public class WoodModelEntry { + + public final T woodTyped; + public final boolean withVariants; + + public WoodModelEntry(T woodTyped, boolean withVariants) { + this.woodTyped = woodTyped; + this.withVariants = withVariants; + } + +} diff --git a/src/main/java/forestry/core/owner/GameProfileDataSerializer.java b/src/main/java/forestry/core/owner/GameProfileDataSerializer.java index 05cd015a43..562363ccd8 100644 --- a/src/main/java/forestry/core/owner/GameProfileDataSerializer.java +++ b/src/main/java/forestry/core/owner/GameProfileDataSerializer.java @@ -1,6 +1,5 @@ package forestry.core.owner; -import java.io.IOException; import java.util.UUID; import com.google.common.base.Optional; diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 2eec17ddba..2c229d0ec2 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -31,8 +31,8 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.core.fluids.Fluids; -import forestry.core.models.BlockModelIndex; -import forestry.core.models.ModelIndex; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.ModelEntry; import forestry.core.tiles.TileAnalyzer; import forestry.core.tiles.TileBase; import forestry.core.tiles.TileEscritoire; @@ -83,10 +83,10 @@ public TileEntitySpecialRenderer getRenderChest(String text return null; } - public void registerBlockModel(BlockModelIndex index) { + public void registerBlockModel(BlockModelEntry index) { } - public void registerModel(ModelIndex index) { + public void registerModel(ModelEntry index) { } public void registerStateMapper(Block block, IStateMapper mapper) { diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 6eddbcd092..6dec954c63 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -58,8 +58,8 @@ import forestry.core.entities.ParticleSmoke; import forestry.core.entities.ParticleSnow; import forestry.core.fluids.Fluids; -import forestry.core.models.BlockModelIndex; -import forestry.core.models.ModelIndex; +import forestry.core.models.BlockModelEntry; +import forestry.core.models.ModelEntry; import forestry.core.models.ModelManager; import forestry.core.render.RenderAnalyzer; import forestry.core.render.RenderEscritoire; @@ -134,7 +134,7 @@ public void bindTexture(ResourceLocation location) { } @Override - public void registerBlockModel(@Nonnull final BlockModelIndex index) { + public void registerBlockModel(@Nonnull final BlockModelEntry index) { ModelManager.getInstance().registerCustomBlockModel(index); if(index.addStateMapper){ StateMapperBase ignoreState = new BlockModeStateMapper(index); @@ -143,7 +143,7 @@ public void registerBlockModel(@Nonnull final BlockModelIndex index) { } @Override - public void registerModel(@Nonnull ModelIndex index) { + public void registerModel(@Nonnull ModelEntry index) { ModelManager.getInstance().registerCustomModel(index); } @@ -318,9 +318,9 @@ public void addEntityPotionFX(World world, double x, double y, double z, int col } private static class BlockModeStateMapper extends StateMapperBase { - private final BlockModelIndex index; + private final BlockModelEntry index; - public BlockModeStateMapper(BlockModelIndex index) { + public BlockModeStateMapper(BlockModelEntry index) { this.index = index; } diff --git a/src/main/java/forestry/energy/EnergyManager.java b/src/main/java/forestry/energy/EnergyManager.java index d94f345c90..488075417c 100644 --- a/src/main/java/forestry/energy/EnergyManager.java +++ b/src/main/java/forestry/energy/EnergyManager.java @@ -2,7 +2,6 @@ import java.io.IOException; -import forestry.core.config.Constants; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaHolder; import net.darkhax.tesla.api.ITeslaProducer; @@ -11,11 +10,11 @@ import net.minecraft.util.EnumFacing; import forestry.api.core.ForestryAPI; +import forestry.core.config.Constants; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.tiles.TileEngine; - import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java index a91fe1773c..0137a7d866 100644 --- a/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarmingClient.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import forestry.core.models.BlockModelIndex; +import forestry.core.models.BlockModelEntry; import forestry.core.proxy.Proxies; import forestry.farming.PluginFarming; import forestry.farming.models.ModelFarmBlock; @@ -21,7 +21,7 @@ public class ProxyFarmingClient extends ProxyFarming { @Override public void initializeModels() { - Proxies.render.registerBlockModel(new BlockModelIndex(new ModelResourceLocation("forestry:ffarm"), + Proxies.render.registerBlockModel(new BlockModelEntry(new ModelResourceLocation("forestry:ffarm"), new ModelResourceLocation("forestry:ffarm", "inventory"), new ModelFarmBlock(), PluginFarming.blocks.farm)); } diff --git a/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java b/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java index 9fa947030b..59f09839f9 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockRegistryGreenhouse.java @@ -1,6 +1,5 @@ package forestry.greenhouse.blocks; -import javax.annotation.Nullable; import java.util.Map; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java index e01dc9cbee..a0673c8087 100644 --- a/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java +++ b/src/main/java/forestry/greenhouse/proxy/ProxyGreenhouseClient.java @@ -10,19 +10,18 @@ ******************************************************************************/ package forestry.greenhouse.proxy; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; - -import net.minecraftforge.client.model.animation.AnimationTESR; -import net.minecraftforge.fml.client.registry.ClientRegistry; import forestry.api.core.ForestryAPI; -import forestry.core.models.BlockModelIndex; +import forestry.core.models.BlockModelEntry; import forestry.core.proxy.Proxies; import forestry.greenhouse.PluginGreenhouse; import forestry.greenhouse.blocks.BlockGreenhouseType; import forestry.greenhouse.models.ModelGreenhouse; import forestry.greenhouse.tiles.TileGreenhouseSprinkler; import forestry.plugins.ForestryPluginUids; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraftforge.client.model.animation.AnimationTESR; +import net.minecraftforge.fml.client.registry.ClientRegistry; public class ProxyGreenhouseClient extends ProxyGreenhouse { @@ -30,7 +29,7 @@ public class ProxyGreenhouseClient extends ProxyGreenhouse { public void initializeModels() { for (BlockGreenhouseType greenhouseType : BlockGreenhouseType.VALUES) { if (greenhouseType == BlockGreenhouseType.DOOR) { - Proxies.render.registerBlockModel(new BlockModelIndex(new ModelResourceLocation("forestry:greenhouse." + greenhouseType, "camouflage"), + Proxies.render.registerBlockModel(new BlockModelEntry(new ModelResourceLocation("forestry:greenhouse." + greenhouseType, "camouflage"), null, new ModelGreenhouse(), PluginGreenhouse.blocks.getGreenhouseBlock(greenhouseType), false)); continue; @@ -47,7 +46,7 @@ null, new ModelGreenhouse(), if (greenhouseBlock != null) { ModelResourceLocation blockModelLocation = new ModelResourceLocation("forestry:greenhouse." + greenhouseType); ModelResourceLocation itemModelLocation = new ModelResourceLocation("forestry:greenhouse", "inventory"); - BlockModelIndex blockModelIndex = new BlockModelIndex(blockModelLocation, itemModelLocation, new ModelGreenhouse(), greenhouseBlock); + BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModelLocation, new ModelGreenhouse(), greenhouseBlock); Proxies.render.registerBlockModel(blockModelIndex); } } diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index 62b7674cb5..075a6a1429 100644 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry; import forestry.api.core.ForestryAPI; -import forestry.core.models.ModelIndex; +import forestry.core.models.ModelEntry; import forestry.core.proxy.Proxies; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.render.ModelButterflyItem; @@ -24,6 +24,6 @@ public class ProxyLepidopterologyClient extends ProxyLepidopterology { @Override public void preInitializeRendering() { RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity.Factory()); - Proxies.render.registerModel(new ModelIndex(ForestryAPI.modelManager.getModelLocation("butterflyGE"), new ModelButterflyItem())); + Proxies.render.registerModel(new ModelEntry(ForestryAPI.modelManager.getModelLocation("butterflyGE"), new ModelButterflyItem())); } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index 8401f4c20d..5402acf056 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -32,12 +32,12 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; -import forestry.core.models.BlankItemModel; +import forestry.core.models.BlankModel; import forestry.core.models.DefaultTextureGetter; import forestry.core.models.TRSRBakedModel; @SideOnly(Side.CLIENT) -public class ModelButterflyItem extends BlankItemModel { +public class ModelButterflyItem extends BlankModel { private final Function textureGetter = new DefaultTextureGetter(); @SideOnly(Side.CLIENT) private IModel modelButterfly; diff --git a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java index f2ba858acc..f374b62e73 100644 --- a/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java +++ b/src/main/java/forestry/plugins/compat/ForestryJeiPlugin.java @@ -4,7 +4,6 @@ import java.util.List; import forestry.core.PluginCore; -import forestry.core.utils.OreDictUtil; import net.minecraft.item.ItemStack; import forestry.plugins.PluginManager; diff --git a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java index da3dda0129..b41b2ba92f 100644 --- a/src/main/java/forestry/storage/proxy/ProxyStorageClient.java +++ b/src/main/java/forestry/storage/proxy/ProxyStorageClient.java @@ -1,7 +1,7 @@ package forestry.storage.proxy; import forestry.core.models.ModelCrate; -import forestry.core.models.ModelIndex; +import forestry.core.models.ModelEntry; import forestry.core.proxy.Proxies; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -10,7 +10,7 @@ public class ProxyStorageClient extends ProxyStorage { @Override public void registerCrateModel() { ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:crate-filled", "crate-filled"); - Proxies.render.registerModel(new ModelIndex(modelLocation, new ModelCrate())); + Proxies.render.registerModel(new ModelEntry(modelLocation, new ModelCrate())); } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door.json similarity index 55% rename from src/main/resources/assets/forestry/blockstates/arboriculture/door/ipe.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/door.json index a35d1ea5e5..992d7f9690 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/ipe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/door.json @@ -1,36 +1,36 @@ { "variants": { - "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 } + "facing=east,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door_bottom" }, + "facing=south,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door_bottom", "y": 90 }, + "facing=west,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door_bottom", "y": 180 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "forestry:arboriculture/door_bottom", "y": 270 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door_bottom_rh" }, + "facing=south,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door_bottom_rh", "y": 90 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door_bottom_rh", "y": 180 }, + "facing=north,half=lower,hinge=right,open=false": { "model": "forestry:arboriculture/door_bottom_rh", "y": 270 }, + "facing=east,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "forestry:arboriculture/door_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door_bottom", "y": 270 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door_bottom" }, + "facing=west,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door_bottom", "y": 90 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "forestry:arboriculture/door_bottom", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door_top" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door_top", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door_top", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "forestry:arboriculture/door_top", "y": 270 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door_top_rh" }, + "facing=south,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door_top_rh", "y": 90 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door_top_rh", "y": 180 }, + "facing=north,half=upper,hinge=right,open=false": { "model": "forestry:arboriculture/door_top_rh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "forestry:arboriculture/door_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door_top", "y": 270 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door_top" }, + "facing=west,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door_top", "y": 90 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "forestry:arboriculture/door_top", "y": 180 } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json deleted file mode 100644 index 7e8460fa49..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/acacia.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/balsa.json deleted file mode 100644 index 136b9519cc..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/balsa.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/baobab.json deleted file mode 100644 index 95c0377661..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/baobab.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/cherry.json deleted file mode 100644 index 6e94cde9b7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/cherry.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/chestnut.json deleted file mode 100644 index be8f9e9789..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/chestnut.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/citrus.json deleted file mode 100644 index 8c862a557e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/citrus.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 6cd4c5a334..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/cocobolo.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index d00e0e5222..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/ebony.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index 432694a13c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/giganteum.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/door/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/greenheart.json deleted file mode 100644 index 87e00c9a7e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/greenheart.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/kapok.json deleted file mode 100644 index 43cab084a6..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/kapok.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index baeb9b1ef8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/larch.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/door/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/lime.json deleted file mode 100644 index 0fd31e7a78..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/lime.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 5702133efe..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahoe.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index 689189907a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/mahogany.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index b5b07f77a1..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/maple.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index c427b65822..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/padauk.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/door/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/palm.json deleted file mode 100644 index 8842787501..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/palm.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/papaya.json deleted file mode 100644 index 7ed501e2ab..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/papaya.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 5b617422ce..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/pine.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/door/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/plum.json deleted file mode 100644 index f3693b55fb..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/plum.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 24ccbff04a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/poplar.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/door/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/sequoia.json deleted file mode 100644 index aad1b5dc8d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/sequoia.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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/door/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/door/teak.json deleted file mode 100644 index a9c54c8773..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/teak.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 14bee8afef..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/walnut.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index 18d5e2a91d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/wenge.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index ebe4ac2cc9..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/willow.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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 deleted file mode 100644 index bdd08c1b60..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/door/zebrawood.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "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/double_slab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab.json new file mode 100644 index 0000000000..a4a279924d --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:arboriculture/slab_double" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/acacia.json deleted file mode 100644 index 66160fcec8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/acacia.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/acacia_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/balsa.json deleted file mode 100644 index 8ee57ca36e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/balsa.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/balsa_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/baobab.json deleted file mode 100644 index 84ff9b797c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/baobab.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/baobab_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cherry.json deleted file mode 100644 index da11708af4..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cherry.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/cherry_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/chestnut.json deleted file mode 100644 index 3f70658d3c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/chestnut.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/chestnut_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/citrus.json deleted file mode 100644 index 305762ab30..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/citrus.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/citrus_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cocobolo.json deleted file mode 100644 index 45f43dcaa7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/cocobolo.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/cocobolo_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ebony.json deleted file mode 100644 index c79bb9323f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ebony.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/ebony_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/giganteum.json deleted file mode 100644 index 63280e1da7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/giganteum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/giganteum_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/greenheart.json deleted file mode 100644 index d5930cf729..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/greenheart.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/greenheart_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ipe.json deleted file mode 100644 index 00b0593b3f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/ipe.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/ipe_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/kapok.json deleted file mode 100644 index bc690a4ef6..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/kapok.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/kapok_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/larch.json deleted file mode 100644 index 2b2cb45a1d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/larch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/larch_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/lime.json deleted file mode 100644 index 3147408d40..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/lime_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahoe.json deleted file mode 100644 index 597dec132f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahoe.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/mahoe_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahogany.json deleted file mode 100644 index 1c3e5758d0..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/mahogany.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/mahogany_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/maple.json deleted file mode 100644 index 0c2d1e4734..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/maple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/maple_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/padauk.json deleted file mode 100644 index f378307afb..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/padauk.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/padauk_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/palm.json deleted file mode 100644 index a465316df0..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/palm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/palm_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/papaya.json deleted file mode 100644 index b524defff0..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/papaya.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/papaya_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/pine.json deleted file mode 100644 index e5c1cacccf..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/pine.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/pine_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/plum.json deleted file mode 100644 index 5cb7b9f2fc..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/plum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/plum_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/poplar.json deleted file mode 100644 index 32908b0ed1..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/poplar.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/poplar_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/sequoia.json deleted file mode 100644 index 9d9460d633..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/sequoia.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/sequoia_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/teak.json deleted file mode 100644 index 42629d1d02..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/teak.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/teak_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/walnut.json deleted file mode 100644 index 853d7b3867..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/walnut.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/walnut_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/wenge.json deleted file mode 100644 index f3122be575..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/wenge.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/wenge_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/willow.json deleted file mode 100644 index 1635f9be63..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/willow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/willow_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/zebrawood.json deleted file mode 100644 index ed4b4d2221..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/double_slab/zebrawood.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/slab/zebrawood_double" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence.json new file mode 100644 index 0000000000..70a383ba29 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forestry:arboriculture/fence_post", + "textures": { + "particle": "forestry:blocks/wood/planks.acacia", + "texture": "forestry:blocks/wood/planks.acacia" + }, + "uvlock": true, + "transform": "forge:default-block" + }, + "variants": { + "north": { + "true": {"submodel": "forestry:arboriculture/fence_side", "uvlock": true, "textures": { "texture": "forestry:blocks/wood/planks.acacia"}}, + "false": {} + }, + "south": { + "true": {"submodel": "forestry:arboriculture/fence_side", "y": 180, "uvlock": true, "textures": { "texture": "forestry:blocks/wood/planks.acacia"}}, + "false": {} + }, + "east": { + "true": {"submodel": "forestry:arboriculture/fence_side", "y": 90, "uvlock": true, "textures": { "texture": "forestry:blocks/wood/planks.acacia"}}, + "false": {} + }, + "west": { + "true": {"submodel": "forestry:arboriculture/fence_side", "y": 270, "uvlock": true, "textures": { "texture": "forestry:blocks/wood/planks.acacia"}}, + "false": {} + } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json deleted file mode 100644 index f251ac49ef..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/acacia.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index e30fb4755a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/balsa.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index ed327bc379..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/baobab.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 00f9cd1fbb..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cherry.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 3b8ab6d811..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/chestnut.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 289d6e3828..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/citrus.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 1e510020c9..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/cocobolo.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index f4d8b13e3a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ebony.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 5eab0b8115..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/giganteum.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index d1190e701c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/greenheart.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 99bbfc7185..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/ipe.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 06afa37f5d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/kapok.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 8ee724b8ba..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/larch.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index be098f6d52..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/lime.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 538d475182..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahoe.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index bcbdd90640..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/mahogany.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 789a42bfa2..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/maple.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 000b4de235..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/padauk.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index cf14277794..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/palm.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 3cdd936715..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/papaya.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index bfb0947ae2..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/pine.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index f529343bf9..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/plum.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 18f8a8b9b9..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/poplar.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 8119d0c7af..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/sequoia.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index bbe6256794..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/teak.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 3080d91d45..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/walnut.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index 56cfa458b4..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/wenge.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index ad8556aa51..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/willow.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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 deleted file mode 100644 index ac19d47614..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence/zebrawood.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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_gate/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate.json similarity index 51% rename from src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ipe.json rename to src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate.json index 6782f8f54e..2f032dd723 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ipe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate.json @@ -1,20 +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 } + "facing=south,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate_closed" }, + "facing=west,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=false": { "model": "forestry:arboriculture/fence_gate_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate_open" }, + "facing=west,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=false,open=true": { "model": "forestry:arboriculture/fence_gate_open", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate_wall_closed" }, + "facing=west,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate_wall_closed", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate_wall_closed", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=false": { "model": "forestry:arboriculture/fence_gate_wall_closed", "y": 270, "uvlock": true }, + "facing=south,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate_wall_open" }, + "facing=west,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate_wall_open", "y": 90, "uvlock": true }, + "facing=north,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate_wall_open", "y": 180, "uvlock": true }, + "facing=east,in_wall=true,open=true": { "model": "forestry:arboriculture/fence_gate_wall_open", "y": 270, "uvlock": true } } } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json deleted file mode 100644 index e6312fd584..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/acacia.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/balsa.json deleted file mode 100644 index d86b264a10..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/balsa.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/baobab.json deleted file mode 100644 index 89b37eaf37..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/baobab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cherry.json deleted file mode 100644 index 956f7f7082..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cherry.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/chestnut.json deleted file mode 100644 index 821fcacf41..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/chestnut.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/citrus.json deleted file mode 100644 index 83bf0dff64..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/citrus.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cocobolo.json deleted file mode 100644 index c42bac0170..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/cocobolo.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ebony.json deleted file mode 100644 index 1057c03550..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/ebony.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/giganteum.json deleted file mode 100644 index 9108ae970c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/giganteum.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/greenheart.json deleted file mode 100644 index 0593d1332e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/greenheart.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/kapok.json deleted file mode 100644 index 39539a19e0..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/kapok.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/larch.json deleted file mode 100644 index deb25a698f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/larch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/lime.json deleted file mode 100644 index def295913e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/lime.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index e4a6693ffe..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahoe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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_gate/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahogany.json deleted file mode 100644 index 50da0b6b57..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/mahogany.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 9acfbaa360..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/maple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index ff60610afd..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/padauk.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index 80c5ff40e4..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/palm.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index ddae213862..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/papaya.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index 30511a5877..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/pine.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index c1ef34e3e8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/plum.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index dedcf61e2d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/poplar.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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_gate/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/sequoia.json deleted file mode 100644 index f6848aeb9e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/sequoia.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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_gate/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/teak.json deleted file mode 100644 index af12482e98..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/teak.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 1f23e2783a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/walnut.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index 888561fe72..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/wenge.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index e9b68a2d4f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/willow.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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_gate/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/zebrawood.json deleted file mode 100644 index 5a8b03a0e7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fence_gate/zebrawood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "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/log.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log.json new file mode 100644 index 0000000000..0b2ba1fce3 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/log.json @@ -0,0 +1,8 @@ +{ + "variants": { + "axis=y": { "model": "forestry:arboriculture/log" }, + "axis=z": { "model": "forestry:arboriculture/log_side" }, + "axis=x": { "model": "forestry:arboriculture/log_side", "y": 90 }, + "axis=none": { "model": "forestry:arboriculture/log_bark" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json deleted file mode 100644 index f574c5d487..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/acacia.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index a5bfc8821f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/balsa.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 36df536a26..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/baobab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 0f85dae8b9..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/cherry.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index be9cfc389e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/chestnut.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index b95457d07e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/citrus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index ec0fa57b47..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/cocobolo.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index d8bf3ae0d1..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/ebony.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 6ca20470b7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/giganteum.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 97a00a897c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/greenheart.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 4bd4e68b03..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/ipe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 712c741c21..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/kapok.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 6536677623..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/larch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 98641cf9cd..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/lime.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 88f597681d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahoe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 63d136a3e4..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/mahogany.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 96bdd2abd2..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/maple.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index fc5094d32c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/padauk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 045197d80f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/palm.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 17db15064a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/papaya.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 90af4fb061..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/pine.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 4a5e47e891..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/plum.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 60900c066a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/poplar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index a567b17da2..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/sequoia.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index c09255cd20..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/teak.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 8b12229bb1..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/walnut.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 116fe23dc5..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/wenge.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 94db074e0c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/willow.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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 deleted file mode 100644 index 388927240c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/log/zebrawood.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "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/blockstates/arboriculture/planks.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks.json new file mode 100644 index 0000000000..900daf414c --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/planks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "forestry:arboriculture/planks" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/acacia.json deleted file mode 100644 index 8a1dc696de..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/acacia.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/acacia" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/balsa.json deleted file mode 100644 index 7e89b5a537..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/balsa.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/balsa" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/baobab.json deleted file mode 100644 index fc509dd005..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/baobab.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/baobab" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/cherry.json deleted file mode 100644 index 7cbbbef454..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/cherry.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/cherry" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/chestnut.json deleted file mode 100644 index de37f1c1f7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/chestnut.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/chestnut" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/citrus.json deleted file mode 100644 index 18c5160e21..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/citrus.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/citrus" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/cocobolo.json deleted file mode 100644 index 356264a29a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/cocobolo.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/cocobolo" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/ebony.json deleted file mode 100644 index cf7a49e84d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/ebony.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/ebony" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/giganteum.json deleted file mode 100644 index f304a4dbc6..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/giganteum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/giganteum" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/greenheart.json deleted file mode 100644 index 8ce8ba8f47..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/greenheart.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/greenheart" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/ipe.json deleted file mode 100644 index e5c7982120..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/ipe.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/ipe" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/kapok.json deleted file mode 100644 index 6a8e5ca1a5..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/kapok.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/kapok" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/larch.json deleted file mode 100644 index 6a20e51247..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/larch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/larch" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/lime.json deleted file mode 100644 index 4efdd8df6d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/lime" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahoe.json deleted file mode 100644 index 0ebff5f3db..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahoe.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/mahoe" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahogany.json deleted file mode 100644 index 9f32549dbf..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/mahogany.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/mahogany" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/maple.json deleted file mode 100644 index 82b4f370fa..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/maple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/maple" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/padauk.json deleted file mode 100644 index ec17fcde17..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/padauk.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/padauk" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/palm.json deleted file mode 100644 index d50ca26928..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/palm.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/palm" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/papaya.json deleted file mode 100644 index 4cb03405b2..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/papaya.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/papaya" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/pine.json deleted file mode 100644 index 1009e0024d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/pine.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/pine" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/plum.json deleted file mode 100644 index 1d3be67bd2..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/plum.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/plum" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/poplar.json deleted file mode 100644 index df7afd74d8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/poplar.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/poplar" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/sequoia.json deleted file mode 100644 index 0fad4c766c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/sequoia.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/sequoia" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/teak.json deleted file mode 100644 index e30967f7f8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/teak.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/teak" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/walnut.json deleted file mode 100644 index 3a80e10d32..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/walnut.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/walnut" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/wenge.json deleted file mode 100644 index ab549eef67..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/wenge.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/wenge" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/willow.json deleted file mode 100644 index 39d8d8f378..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/willow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/willow" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/planks/zebrawood.json deleted file mode 100644 index 4cadf6b4f1..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/planks/zebrawood.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "forestry:arboriculture/planks/zebrawood" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab.json new file mode 100644 index 0000000000..bc573f00a7 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/slab.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=bottom": { "model": "forestry:arboriculture/slab_half" }, + "half=top": { "model": "forestry:arboriculture/slab_upper" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/acacia.json deleted file mode 100644 index f46fb27212..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/acacia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/acacia_half" }, - "half=top": { "model": "forestry:arboriculture/slab/acacia_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/balsa.json deleted file mode 100644 index e7d4f5ff1c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/balsa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/balsa_half" }, - "half=top": { "model": "forestry:arboriculture/slab/balsa_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/baobab.json deleted file mode 100644 index 35e7631438..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/baobab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/baobab_half" }, - "half=top": { "model": "forestry:arboriculture/slab/baobab_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/cherry.json deleted file mode 100644 index 908b74c525..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/cherry.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/cherry_half" }, - "half=top": { "model": "forestry:arboriculture/slab/cherry_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/chestnut.json deleted file mode 100644 index 1185fd8145..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/chestnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/chestnut_half" }, - "half=top": { "model": "forestry:arboriculture/slab/chestnut_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/citrus.json deleted file mode 100644 index c439c04b06..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/citrus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/citrus_half" }, - "half=top": { "model": "forestry:arboriculture/slab/citrus_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/cocobolo.json deleted file mode 100644 index db4631575c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/cocobolo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/cocobolo_half" }, - "half=top": { "model": "forestry:arboriculture/slab/cocobolo_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/ebony.json deleted file mode 100644 index 82f312db0e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/ebony.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/ebony_half" }, - "half=top": { "model": "forestry:arboriculture/slab/ebony_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/giganteum.json deleted file mode 100644 index 34f22be4cf..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/giganteum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/giganteum_half" }, - "half=top": { "model": "forestry:arboriculture/slab/giganteum_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/greenheart.json deleted file mode 100644 index e319e8fad9..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/greenheart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/greenheart_half" }, - "half=top": { "model": "forestry:arboriculture/slab/greenheart_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/ipe.json deleted file mode 100644 index 9e32fe6a03..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/ipe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/ipe_half" }, - "half=top": { "model": "forestry:arboriculture/slab/ipe_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/kapok.json deleted file mode 100644 index b586554745..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/kapok.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/kapok_half" }, - "half=top": { "model": "forestry:arboriculture/slab/kapok_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/larch.json deleted file mode 100644 index 828454acad..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/larch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/larch_half" }, - "half=top": { "model": "forestry:arboriculture/slab/larch_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/lime.json deleted file mode 100644 index eb2791d2b5..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/lime_half" }, - "half=top": { "model": "forestry:arboriculture/slab/lime_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahoe.json deleted file mode 100644 index 21b752b8d5..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/mahoe_half" }, - "half=top": { "model": "forestry:arboriculture/slab/mahoe_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahogany.json deleted file mode 100644 index 90997db49f..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/mahogany.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/mahogany_half" }, - "half=top": { "model": "forestry:arboriculture/slab/mahogany_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/maple.json deleted file mode 100644 index 2038c6818d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/maple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/maple_half" }, - "half=top": { "model": "forestry:arboriculture/slab/maple_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/padauk.json deleted file mode 100644 index 5916de3bbb..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/padauk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/padauk_half" }, - "half=top": { "model": "forestry:arboriculture/slab/padauk_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/palm.json deleted file mode 100644 index 673f58dbed..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/palm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/palm_half" }, - "half=top": { "model": "forestry:arboriculture/slab/palm_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/papaya.json deleted file mode 100644 index 4b75bd1600..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/papaya.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/papaya_half" }, - "half=top": { "model": "forestry:arboriculture/slab/papaya_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/pine.json deleted file mode 100644 index 77ed449d1e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/pine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/pine_half" }, - "half=top": { "model": "forestry:arboriculture/slab/pine_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json deleted file mode 100644 index faa7b42500..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/plum_half" }, - "half=top": { "model": "forestry:arboriculture/slab/plum_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/poplar.json deleted file mode 100644 index 317a675d98..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/poplar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/poplar_half" }, - "half=top": { "model": "forestry:arboriculture/slab/poplar_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/sequoia.json deleted file mode 100644 index 088a8386f7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/sequoia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/sequoia_half" }, - "half=top": { "model": "forestry:arboriculture/slab/sequoia_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/teak.json deleted file mode 100644 index 32b265010a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/teak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/teak_half" }, - "half=top": { "model": "forestry:arboriculture/slab/teak_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/walnut.json deleted file mode 100644 index 5b85a4ac5e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/walnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/walnut_half" }, - "half=top": { "model": "forestry:arboriculture/slab/walnut_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/wenge.json deleted file mode 100644 index 7b3d056ff4..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/wenge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/wenge_half" }, - "half=top": { "model": "forestry:arboriculture/slab/wenge_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/willow.json deleted file mode 100644 index e440801966..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/willow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/willow_half" }, - "half=top": { "model": "forestry:arboriculture/slab/willow_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/zebrawood.json deleted file mode 100644 index c5908802c4..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/zebrawood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "half=bottom": { "model": "forestry:arboriculture/slab/zebrawood_half" }, - "half=top": { "model": "forestry:arboriculture/slab/zebrawood_upper" } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs.json new file mode 100644 index 0000000000..98851ad058 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs_inner", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/acacia.json deleted file mode 100644 index d30c442f8b..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/acacia.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/acacia" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/acacia", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/acacia_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/acacia_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/balsa.json deleted file mode 100644 index 9e259f51aa..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/balsa.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/balsa" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/balsa", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/balsa_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/balsa_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/baobab.json deleted file mode 100644 index b4bc692bc6..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/baobab.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/baobab" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/baobab", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/baobab_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/baobab_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cherry.json deleted file mode 100644 index b3ba3168c7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cherry.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cherry" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cherry", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cherry_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cherry_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/chestnut.json deleted file mode 100644 index 3ad05e3dcb..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/chestnut.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/chestnut", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/chestnut_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/chestnut_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/citrus.json deleted file mode 100644 index 4052b495e8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/citrus.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/citrus" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/citrus", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/citrus_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/citrus_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cocobolo.json deleted file mode 100644 index 7c0a3160c7..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/cocobolo.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/cocobolo", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/cocobolo_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/cocobolo_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ebony.json deleted file mode 100644 index 0356928c94..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ebony.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ebony" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ebony", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ebony_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ebony_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/giganteum.json deleted file mode 100644 index 7d57eda846..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/giganteum.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/giganteum", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/giganteum_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/giganteum_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/greenheart.json deleted file mode 100644 index 17543bfab3..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/greenheart.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/greenheart", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/greenheart_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/greenheart_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ipe.json deleted file mode 100644 index c5fb11c4f8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/ipe.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ipe" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/ipe", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/ipe_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/ipe_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/kapok.json deleted file mode 100644 index 6a80ef482a..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/kapok.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/kapok" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/kapok", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/kapok_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/kapok_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/larch.json deleted file mode 100644 index 2a9e502848..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/larch.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/larch" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/larch", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/larch_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/larch_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/lime.json deleted file mode 100644 index 2808b05b72..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/lime.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/lime" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/lime", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/lime_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/lime_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahoe.json deleted file mode 100644 index f8eb3084ca..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahoe.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahoe", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahoe_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahoe_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahogany.json deleted file mode 100644 index 72994db670..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/mahogany.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/mahogany", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/mahogany_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/mahogany_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/maple.json deleted file mode 100644 index ab68540261..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/maple.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/maple" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/maple", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/maple_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/maple_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/padauk.json deleted file mode 100644 index b5298a13db..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/padauk.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/padauk" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/padauk", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/padauk_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/padauk_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/palm.json deleted file mode 100644 index 18f6369f9c..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/palm.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/palm" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/palm", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/palm_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/palm_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/papaya.json deleted file mode 100644 index 4122929884..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/papaya.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/papaya" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/papaya", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/papaya_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/papaya_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/pine.json deleted file mode 100644 index 22f7295477..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/pine.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/pine" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/pine", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/pine_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/pine_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/plum.json deleted file mode 100644 index 4710841da8..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/plum.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/plum" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/plum", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/plum_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/plum_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/poplar.json deleted file mode 100644 index 879452d704..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/poplar.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/poplar" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/poplar", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/poplar_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/poplar_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/sequoia.json deleted file mode 100644 index e10f39b775..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/sequoia.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/sequoia", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/sequoia_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/sequoia_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/teak.json deleted file mode 100644 index aed353e81e..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/teak.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/teak" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/teak", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/teak_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/teak_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/walnut.json deleted file mode 100644 index 296296565d..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/walnut.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/walnut" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/walnut", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/walnut_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/walnut_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/wenge.json deleted file mode 100644 index 90a2978775..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/wenge.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/wenge" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/wenge", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/wenge_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/wenge_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/willow.json deleted file mode 100644 index 6b79777a38..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/willow.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/willow" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/willow", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/willow_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/willow_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/zebrawood.json deleted file mode 100644 index 64951728ff..0000000000 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/stairs/zebrawood.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood" }, - "facing=west,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "forestry:arboriculture/stairs/zebrawood", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "forestry:arboriculture/stairs/zebrawood_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "forestry:arboriculture/stairs/zebrawood_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom.json deleted file mode 100644 index 63247ec818..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/balsa_lower", - "top": "forestry:blocks/doors/balsa_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom_rh.json deleted file mode 100644 index 1d7639c6ad..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/balsa_lower", - "top": "forestry:blocks/doors/balsa_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top.json deleted file mode 100644 index 8cf074966f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/balsa_lower", - "top": "forestry:blocks/doors/balsa_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top_rh.json deleted file mode 100644 index 2539bd76c8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/balsa_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/balsa_lower", - "top": "forestry:blocks/doors/balsa_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom.json deleted file mode 100644 index e72bfd5a76..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/baobab_lower", - "top": "forestry:blocks/doors/baobab_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom_rh.json deleted file mode 100644 index 89649bbaa7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/baobab_lower", - "top": "forestry:blocks/doors/baobab_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top.json deleted file mode 100644 index 787e1ed052..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/baobab_lower", - "top": "forestry:blocks/doors/baobab_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top_rh.json deleted file mode 100644 index 9a3fe289a6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/baobab_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/baobab_lower", - "top": "forestry:blocks/doors/baobab_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom.json deleted file mode 100644 index a8ec805b88..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/cherry_lower", - "top": "forestry:blocks/doors/cherry_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom_rh.json deleted file mode 100644 index 39e1502957..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/cherry_lower", - "top": "forestry:blocks/doors/cherry_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top.json deleted file mode 100644 index 60afd82da9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/cherry_lower", - "top": "forestry:blocks/doors/cherry_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top_rh.json deleted file mode 100644 index 5bca27f8bc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cherry_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/cherry_lower", - "top": "forestry:blocks/doors/cherry_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom.json deleted file mode 100644 index bf5ab19ee9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/chestnut_lower", - "top": "forestry:blocks/doors/chestnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom_rh.json deleted file mode 100644 index 82afbbf550..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/chestnut_lower", - "top": "forestry:blocks/doors/chestnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top.json deleted file mode 100644 index 3ee96e0b01..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/chestnut_lower", - "top": "forestry:blocks/doors/chestnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top_rh.json deleted file mode 100644 index 4ebba4b7a1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/chestnut_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/chestnut_lower", - "top": "forestry:blocks/doors/chestnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom.json deleted file mode 100644 index 504f2ce43a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/citrus_lower", - "top": "forestry:blocks/doors/citrus_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom_rh.json deleted file mode 100644 index 93e69de583..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/citrus_lower", - "top": "forestry:blocks/doors/citrus_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top.json deleted file mode 100644 index dd1b542a41..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/citrus_lower", - "top": "forestry:blocks/doors/citrus_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top_rh.json deleted file mode 100644 index 3874cbb0ea..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/citrus_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/citrus_lower", - "top": "forestry:blocks/doors/citrus_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom.json deleted file mode 100644 index a88d35a4e1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/cocobolo_lower", - "top": "forestry:blocks/doors/cocobolo_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom_rh.json deleted file mode 100644 index 760a98e60d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/cocobolo_lower", - "top": "forestry:blocks/doors/cocobolo_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top.json deleted file mode 100644 index b6e8aae3f1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/cocobolo_lower", - "top": "forestry:blocks/doors/cocobolo_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top_rh.json deleted file mode 100644 index d019ac87f5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/cocobolo_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/cocobolo_lower", - "top": "forestry:blocks/doors/cocobolo_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom.json deleted file mode 100644 index c4455c9629..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/ebony_lower", - "top": "forestry:blocks/doors/ebony_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom_rh.json deleted file mode 100644 index 5320385788..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/ebony_lower", - "top": "forestry:blocks/doors/ebony_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top.json deleted file mode 100644 index a9337c1d75..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/ebony_lower", - "top": "forestry:blocks/doors/ebony_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top_rh.json deleted file mode 100644 index 753aa6a286..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ebony_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/ebony_lower", - "top": "forestry:blocks/doors/ebony_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom.json deleted file mode 100644 index 76256c7b01..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/giganteum_lower", - "top": "forestry:blocks/doors/giganteum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom_rh.json deleted file mode 100644 index 6e6aefa2ec..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/giganteum_lower", - "top": "forestry:blocks/doors/giganteum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top.json deleted file mode 100644 index 5fb44b5a71..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/giganteum_lower", - "top": "forestry:blocks/doors/giganteum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top_rh.json deleted file mode 100644 index 1865460feb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/giganteum_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/giganteum_lower", - "top": "forestry:blocks/doors/giganteum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom.json deleted file mode 100644 index 7e25484859..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/greenheart_lower", - "top": "forestry:blocks/doors/greenheart_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom_rh.json deleted file mode 100644 index 876dad6768..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/greenheart_lower", - "top": "forestry:blocks/doors/greenheart_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top.json deleted file mode 100644 index c48df3ec7c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/greenheart_lower", - "top": "forestry:blocks/doors/greenheart_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top_rh.json deleted file mode 100644 index dd69e479a2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/greenheart_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/greenheart_lower", - "top": "forestry:blocks/doors/greenheart_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom.json deleted file mode 100644 index 43c97b8c8f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/ipe_lower", - "top": "forestry:blocks/doors/ipe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom_rh.json deleted file mode 100644 index 4dc36d0d96..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/ipe_lower", - "top": "forestry:blocks/doors/ipe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top.json deleted file mode 100644 index 6076133a22..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/ipe_lower", - "top": "forestry:blocks/doors/ipe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top_rh.json deleted file mode 100644 index 9996610e7b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/ipe_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/ipe_lower", - "top": "forestry:blocks/doors/ipe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom.json deleted file mode 100644 index ad6ca4d43c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/kapok_lower", - "top": "forestry:blocks/doors/kapok_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom_rh.json deleted file mode 100644 index ef80b93792..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/kapok_lower", - "top": "forestry:blocks/doors/kapok_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top.json deleted file mode 100644 index 14e3d17890..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/kapok_lower", - "top": "forestry:blocks/doors/kapok_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top_rh.json deleted file mode 100644 index 578eb80539..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/kapok_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/kapok_lower", - "top": "forestry:blocks/doors/kapok_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom.json deleted file mode 100644 index 9a19003f6d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/larch_lower", - "top": "forestry:blocks/doors/larch_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom_rh.json deleted file mode 100644 index 2d5dbd7278..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/larch_lower", - "top": "forestry:blocks/doors/larch_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top.json deleted file mode 100644 index 78666ad846..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/larch_lower", - "top": "forestry:blocks/doors/larch_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top_rh.json deleted file mode 100644 index a9132cf52f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/larch_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/larch_lower", - "top": "forestry:blocks/doors/larch_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom.json deleted file mode 100644 index 3363244a6c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/lime_lower", - "top": "forestry:blocks/doors/lime_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom_rh.json deleted file mode 100644 index 0e5522740a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/lime_lower", - "top": "forestry:blocks/doors/lime_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top.json deleted file mode 100644 index e0753e828d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/lime_lower", - "top": "forestry:blocks/doors/lime_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top_rh.json deleted file mode 100644 index 26d74c44bc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/lime_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/lime_lower", - "top": "forestry:blocks/doors/lime_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom.json deleted file mode 100644 index b34bfbb2ec..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/mahoe_lower", - "top": "forestry:blocks/doors/mahoe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom_rh.json deleted file mode 100644 index b86018f8d6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/mahoe_lower", - "top": "forestry:blocks/doors/mahoe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top.json deleted file mode 100644 index afb9d6ebf2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/mahoe_lower", - "top": "forestry:blocks/doors/mahoe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top_rh.json deleted file mode 100644 index 65c364ffd8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahoe_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/mahoe_lower", - "top": "forestry:blocks/doors/mahoe_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom.json deleted file mode 100644 index 046ce51174..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/mahogany_lower", - "top": "forestry:blocks/doors/mahogany_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom_rh.json deleted file mode 100644 index 55516c8ffb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/mahogany_lower", - "top": "forestry:blocks/doors/mahogany_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top.json deleted file mode 100644 index c89a325ade..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/mahogany_lower", - "top": "forestry:blocks/doors/mahogany_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top_rh.json deleted file mode 100644 index 7ed62f8644..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/mahogany_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/mahogany_lower", - "top": "forestry:blocks/doors/mahogany_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom.json deleted file mode 100644 index e0f9bc6be0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/maple_lower", - "top": "forestry:blocks/doors/maple_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom_rh.json deleted file mode 100644 index 6127ebdd8c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/maple_lower", - "top": "forestry:blocks/doors/maple_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top.json deleted file mode 100644 index 0a2d3685e6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/maple_lower", - "top": "forestry:blocks/doors/maple_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top_rh.json deleted file mode 100644 index b85fc13b3c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/maple_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/maple_lower", - "top": "forestry:blocks/doors/maple_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom.json deleted file mode 100644 index 14583ffa95..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/padauk_lower", - "top": "forestry:blocks/doors/padauk_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom_rh.json deleted file mode 100644 index b2037fd9a5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/padauk_lower", - "top": "forestry:blocks/doors/padauk_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top.json deleted file mode 100644 index 854d75e298..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/padauk_lower", - "top": "forestry:blocks/doors/padauk_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top_rh.json deleted file mode 100644 index d8f849b8d0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/padauk_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/padauk_lower", - "top": "forestry:blocks/doors/padauk_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom.json deleted file mode 100644 index 4b181b7999..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/palm_lower", - "top": "forestry:blocks/doors/palm_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom_rh.json deleted file mode 100644 index d8482184a5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/palm_lower", - "top": "forestry:blocks/doors/palm_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top.json deleted file mode 100644 index 940bbcbab3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/palm_lower", - "top": "forestry:blocks/doors/palm_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top_rh.json deleted file mode 100644 index 5c792fb9c2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/palm_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/palm_lower", - "top": "forestry:blocks/doors/palm_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom.json deleted file mode 100644 index 092b0c1aaf..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/papaya_lower", - "top": "forestry:blocks/doors/papaya_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom_rh.json deleted file mode 100644 index 56d2378c3d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/papaya_lower", - "top": "forestry:blocks/doors/papaya_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top.json deleted file mode 100644 index c84655a155..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/papaya_lower", - "top": "forestry:blocks/doors/papaya_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top_rh.json deleted file mode 100644 index f5064aa7d1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/papaya_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/papaya_lower", - "top": "forestry:blocks/doors/papaya_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom.json deleted file mode 100644 index e7beb353ae..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/pine_lower", - "top": "forestry:blocks/doors/pine_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom_rh.json deleted file mode 100644 index 24618e0dd5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/pine_lower", - "top": "forestry:blocks/doors/pine_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top.json deleted file mode 100644 index e88d6d3894..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/pine_lower", - "top": "forestry:blocks/doors/pine_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top_rh.json deleted file mode 100644 index db0898483d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/pine_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/pine_lower", - "top": "forestry:blocks/doors/pine_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom.json deleted file mode 100644 index ada89f5656..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/plum_lower", - "top": "forestry:blocks/doors/plum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom_rh.json deleted file mode 100644 index 9aa8f2b492..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/plum_lower", - "top": "forestry:blocks/doors/plum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top.json deleted file mode 100644 index 994f6daa88..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/plum_lower", - "top": "forestry:blocks/doors/plum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top_rh.json deleted file mode 100644 index 69c8c1af39..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/plum_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/plum_lower", - "top": "forestry:blocks/doors/plum_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom.json deleted file mode 100644 index 3c12f19e6c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/poplar_lower", - "top": "forestry:blocks/doors/poplar_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom_rh.json deleted file mode 100644 index 89869b0f21..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/poplar_lower", - "top": "forestry:blocks/doors/poplar_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top.json deleted file mode 100644 index 50d92495a5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/poplar_lower", - "top": "forestry:blocks/doors/poplar_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top_rh.json deleted file mode 100644 index 3643721d99..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/poplar_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/poplar_lower", - "top": "forestry:blocks/doors/poplar_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom.json deleted file mode 100644 index 45de05f61d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/sequoia_lower", - "top": "forestry:blocks/doors/sequoia_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom_rh.json deleted file mode 100644 index caf91a7836..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/sequoia_lower", - "top": "forestry:blocks/doors/sequoia_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top.json deleted file mode 100644 index 3b31281ff7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/sequoia_lower", - "top": "forestry:blocks/doors/sequoia_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top_rh.json deleted file mode 100644 index 1f14e82383..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/sequoia_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/sequoia_lower", - "top": "forestry:blocks/doors/sequoia_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom.json deleted file mode 100644 index a38ec81ddc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/teak_lower", - "top": "forestry:blocks/doors/teak_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom_rh.json deleted file mode 100644 index b665063bfb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/teak_lower", - "top": "forestry:blocks/doors/teak_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top.json deleted file mode 100644 index 6c9fb53e75..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/teak_lower", - "top": "forestry:blocks/doors/teak_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top_rh.json deleted file mode 100644 index 4ce30dbe6c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/teak_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/teak_lower", - "top": "forestry:blocks/doors/teak_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom.json deleted file mode 100644 index b134e0d133..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/walnut_lower", - "top": "forestry:blocks/doors/walnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom_rh.json deleted file mode 100644 index 86f742da90..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/walnut_lower", - "top": "forestry:blocks/doors/walnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top.json deleted file mode 100644 index 9e5f4d1343..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/walnut_lower", - "top": "forestry:blocks/doors/walnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top_rh.json deleted file mode 100644 index 4fe779e09a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/walnut_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/walnut_lower", - "top": "forestry:blocks/doors/walnut_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom.json deleted file mode 100644 index 56a326e6d7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/wenge_lower", - "top": "forestry:blocks/doors/wenge_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom_rh.json deleted file mode 100644 index 433df4f9ed..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/wenge_lower", - "top": "forestry:blocks/doors/wenge_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top.json deleted file mode 100644 index e0366bfe99..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/wenge_lower", - "top": "forestry:blocks/doors/wenge_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top_rh.json deleted file mode 100644 index 11ed2e9ca2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/wenge_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/wenge_lower", - "top": "forestry:blocks/doors/wenge_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom.json deleted file mode 100644 index a15cf30718..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/willow_lower", - "top": "forestry:blocks/doors/willow_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom_rh.json deleted file mode 100644 index 2467ea4098..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/willow_lower", - "top": "forestry:blocks/doors/willow_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top.json deleted file mode 100644 index f2d31a7131..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/willow_lower", - "top": "forestry:blocks/doors/willow_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top_rh.json deleted file mode 100644 index 9fb6a140bf..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/willow_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/willow_lower", - "top": "forestry:blocks/doors/willow_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom.json deleted file mode 100644 index f40bcda998..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "forestry:blocks/doors/zebrawood_lower", - "top": "forestry:blocks/doors/zebrawood_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom_rh.json deleted file mode 100644 index 7816d1effe..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "forestry:blocks/doors/zebrawood_lower", - "top": "forestry:blocks/doors/zebrawood_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top.json deleted file mode 100644 index e92a37220a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "forestry:blocks/doors/zebrawood_lower", - "top": "forestry:blocks/doors/zebrawood_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top_rh.json deleted file mode 100644 index 8929b765b0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/zebrawood_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "forestry:blocks/doors/zebrawood_lower", - "top": "forestry:blocks/doors/zebrawood_upper" - } -} diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom.json b/src/main/resources/assets/forestry/models/block/arboriculture/door_bottom.json similarity index 74% rename from src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door_bottom.json index 34446d8a02..02c5431cbf 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/door_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/door_bottom", "textures": { + "particle": "forestry:blocks/doors/acacia_lower", "bottom": "forestry:blocks/doors/acacia_lower", "top": "forestry:blocks/doors/acacia_upper" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door_bottom_rh.json similarity index 75% rename from src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door_bottom_rh.json index 4458d3c9ea..c008576d89 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_bottom_rh.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/door_bottom_rh.json @@ -1,6 +1,7 @@ { "parent": "block/door_bottom_rh", "textures": { + "particle": "forestry:blocks/doors/acacia_lower", "bottom": "forestry:blocks/doors/acacia_lower", "top": "forestry:blocks/doors/acacia_upper" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top.json b/src/main/resources/assets/forestry/models/block/arboriculture/door_top.json similarity index 74% rename from src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door_top.json index f0f8e8f777..aad86a0d7f 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/door_top.json @@ -1,6 +1,7 @@ { "parent": "block/door_top", "textures": { + "particle": "forestry:blocks/doors/acacia_upper", "bottom": "forestry:blocks/doors/acacia_lower", "top": "forestry:blocks/doors/acacia_upper" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top_rh.json b/src/main/resources/assets/forestry/models/block/arboriculture/door_top_rh.json similarity index 74% rename from src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top_rh.json rename to src/main/resources/assets/forestry/models/block/arboriculture/door_top_rh.json index 6851280b3f..d63e397676 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/door/acacia_top_rh.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/door_top_rh.json @@ -1,6 +1,7 @@ { "parent": "block/door_top_rh", "textures": { + "particle": "forestry:blocks/doors/acacia_upper", "bottom": "forestry:blocks/doors/acacia_lower", "top": "forestry:blocks/doors/acacia_upper" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_inventory.json deleted file mode 100644 index e7e081c4b4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_post.json deleted file mode 100644 index 8a7496b437..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_side.json deleted file mode 100644 index 67c813bec7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/balsa_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_inventory.json deleted file mode 100644 index d272aaea5c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_post.json deleted file mode 100644 index 023ffb00b3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_side.json deleted file mode 100644 index afd341f5f9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/baobab_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_inventory.json deleted file mode 100644 index bfbd131100..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_post.json deleted file mode 100644 index 36ca9782d5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_side.json deleted file mode 100644 index e819aee390..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cherry_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_inventory.json deleted file mode 100644 index 02f7eaf317..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_post.json deleted file mode 100644 index 8d92feff38..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_side.json deleted file mode 100644 index 86397812d3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/chestnut_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_inventory.json deleted file mode 100644 index e0a6f83240..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_post.json deleted file mode 100644 index b54abe893a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_side.json deleted file mode 100644 index 38f1f6e7db..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/citrus_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_inventory.json deleted file mode 100644 index fb34997ae0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_post.json deleted file mode 100644 index d12c32a985..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_side.json deleted file mode 100644 index 8bfb2fef88..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/cocobolo_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_inventory.json deleted file mode 100644 index f6342e3651..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_post.json deleted file mode 100644 index d02a9159de..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_side.json deleted file mode 100644 index 2cf07af40d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ebony_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_inventory.json deleted file mode 100644 index bbe209b7d3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_post.json deleted file mode 100644 index ccd539e725..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_side.json deleted file mode 100644 index 2720b4cef0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/giganteum_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_inventory.json deleted file mode 100644 index 279667071d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_post.json deleted file mode 100644 index 005f85940b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_side.json deleted file mode 100644 index 0af48958bf..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/greenheart_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_inventory.json deleted file mode 100644 index bee48c75db..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_post.json deleted file mode 100644 index 04dc760568..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_side.json deleted file mode 100644 index bcc710b899..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/ipe_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_inventory.json deleted file mode 100644 index 61da2ce49c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_post.json deleted file mode 100644 index 87a0899268..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_side.json deleted file mode 100644 index 081d67df9c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/kapok_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_inventory.json deleted file mode 100644 index 7462d8efe9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_post.json deleted file mode 100644 index 716eec2b8c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_side.json deleted file mode 100644 index 9d9e7d9d05..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/larch_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_inventory.json deleted file mode 100644 index 3360ef4757..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_post.json deleted file mode 100644 index 9aea0e4ef3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_side.json deleted file mode 100644 index 480bff830b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/lime_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_inventory.json deleted file mode 100644 index e4c886e7d6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_post.json deleted file mode 100644 index 9dacbc2fb1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_side.json deleted file mode 100644 index 09395f1ea7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahoe_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_inventory.json deleted file mode 100644 index c9c940a74f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_post.json deleted file mode 100644 index d424cee019..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_side.json deleted file mode 100644 index bf3c3b4bcb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/mahogany_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_inventory.json deleted file mode 100644 index 18693cbef0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_post.json deleted file mode 100644 index 9ac64d4eb8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_side.json deleted file mode 100644 index 53991db182..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/maple_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_inventory.json deleted file mode 100644 index dfea9ce357..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_post.json deleted file mode 100644 index 3bdf8c48fe..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_side.json deleted file mode 100644 index 327a3191d5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/padauk_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_inventory.json deleted file mode 100644 index 43ea1f3f73..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_post.json deleted file mode 100644 index f2bf949354..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_side.json deleted file mode 100644 index eb3a5bdb7c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/palm_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_inventory.json deleted file mode 100644 index 5c47b59f3d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_post.json deleted file mode 100644 index 7ed5bd7950..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_side.json deleted file mode 100644 index 33dcd5b043..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/papaya_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_inventory.json deleted file mode 100644 index 48ef0241ad..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_post.json deleted file mode 100644 index b793614877..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_side.json deleted file mode 100644 index c0f8054908..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/pine_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_inventory.json deleted file mode 100644 index efbfd5983b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_post.json deleted file mode 100644 index 4ca58d092f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_side.json deleted file mode 100644 index da22f4781a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/plum_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_inventory.json deleted file mode 100644 index 30dc989b7d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_post.json deleted file mode 100644 index f44d163e6d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_side.json deleted file mode 100644 index b1ab70405b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/poplar_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_inventory.json deleted file mode 100644 index 17cea9bf91..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_post.json deleted file mode 100644 index 371da00094..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_side.json deleted file mode 100644 index b9be0f0244..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/sequoia_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_inventory.json deleted file mode 100644 index e8b9afa11c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_post.json deleted file mode 100644 index e82ab4dfce..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_side.json deleted file mode 100644 index 89f5a5d550..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/teak_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_inventory.json deleted file mode 100644 index ca65aa0126..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_post.json deleted file mode 100644 index 16351556ae..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_side.json deleted file mode 100644 index bb26955cc2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/walnut_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_inventory.json deleted file mode 100644 index 5a798cdc5d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_post.json deleted file mode 100644 index a34f9a0df1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_side.json deleted file mode 100644 index 03fc901443..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/wenge_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_inventory.json deleted file mode 100644 index 1a8d626b94..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_post.json deleted file mode 100644 index 62719e689d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_side.json deleted file mode 100644 index 46d201ae4a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/willow_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_inventory.json deleted file mode 100644 index 447dcfab05..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_post.json deleted file mode 100644 index 32ba3ea77e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_side.json deleted file mode 100644 index 8716be61c2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/zebrawood_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_closed.json deleted file mode 100644 index 54109e4549..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_open.json deleted file mode 100644 index 0728322e24..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_closed.json deleted file mode 100644 index f3f067aa23..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_open.json deleted file mode 100644 index 31d3b382ce..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/balsa_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_closed.json deleted file mode 100644 index d55ea15a5b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_open.json deleted file mode 100644 index 03f9cffd1b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_closed.json deleted file mode 100644 index 9f66d5cde8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_open.json deleted file mode 100644 index da5efb0f3b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/baobab_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_closed.json deleted file mode 100644 index 8e4598344a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_open.json deleted file mode 100644 index b5a2d9b0ee..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_closed.json deleted file mode 100644 index f9d0c1c334..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_open.json deleted file mode 100644 index f3ef7684ae..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cherry_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_closed.json deleted file mode 100644 index d3dd820c7d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_open.json deleted file mode 100644 index 602b864dc0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_closed.json deleted file mode 100644 index a954d308e0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_open.json deleted file mode 100644 index d866d80424..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/chestnut_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_closed.json deleted file mode 100644 index de71a8f438..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_open.json deleted file mode 100644 index 67e65ccec9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_closed.json deleted file mode 100644 index f598c6c1c0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_open.json deleted file mode 100644 index c1a4a81649..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/citrus_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_closed.json deleted file mode 100644 index a2ae2561dd..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_open.json deleted file mode 100644 index b90db3c1b4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_closed.json deleted file mode 100644 index f03774347b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_open.json deleted file mode 100644 index 9e62c565f9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/cocobolo_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_closed.json deleted file mode 100644 index 95309fe09c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_open.json deleted file mode 100644 index 803325da6d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_closed.json deleted file mode 100644 index 5c999e3cf8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_open.json deleted file mode 100644 index 2cae1982b1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ebony_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_closed.json deleted file mode 100644 index ca849e7658..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_open.json deleted file mode 100644 index 4e3077ea42..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_closed.json deleted file mode 100644 index e2148d3524..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_open.json deleted file mode 100644 index a2347bec57..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/giganteum_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_closed.json deleted file mode 100644 index b7176acfd9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_open.json deleted file mode 100644 index 0f4d10e4f2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_closed.json deleted file mode 100644 index 729bcf56b7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_open.json deleted file mode 100644 index 92f6eeadab..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/greenheart_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_closed.json deleted file mode 100644 index f069b1b1c6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_open.json deleted file mode 100644 index 14bca1c48e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_closed.json deleted file mode 100644 index 5884c1d4e0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_open.json deleted file mode 100644 index 76a2ff0165..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/ipe_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_closed.json deleted file mode 100644 index b1d4426403..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_open.json deleted file mode 100644 index 65bc3b636f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_closed.json deleted file mode 100644 index 8c66174f9c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_open.json deleted file mode 100644 index b7e3785fae..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/kapok_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_closed.json deleted file mode 100644 index e5aa555841..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_open.json deleted file mode 100644 index a3fb3bdf0a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_closed.json deleted file mode 100644 index 930b0c601e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_open.json deleted file mode 100644 index 2a230465d0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/larch_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_closed.json deleted file mode 100644 index 1fafc700f4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_open.json deleted file mode 100644 index 7c078945fa..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_closed.json deleted file mode 100644 index bfd2827737..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_open.json deleted file mode 100644 index d0e32df8cb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/lime_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_closed.json deleted file mode 100644 index 24991befc2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_open.json deleted file mode 100644 index 24ec81525c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_closed.json deleted file mode 100644 index e830664c45..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_open.json deleted file mode 100644 index 0265272b0a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahoe_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_closed.json deleted file mode 100644 index 31889964b3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_open.json deleted file mode 100644 index 0ad1681c97..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_closed.json deleted file mode 100644 index 1d81b857ba..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_open.json deleted file mode 100644 index bd798501e3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/mahogany_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_closed.json deleted file mode 100644 index 46d6aede9c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_open.json deleted file mode 100644 index e0071f4fd2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_closed.json deleted file mode 100644 index 976afff22c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_open.json deleted file mode 100644 index 5a55096deb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/maple_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_closed.json deleted file mode 100644 index f84883278d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_open.json deleted file mode 100644 index b146e871c7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_closed.json deleted file mode 100644 index 2fc1a095a1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_open.json deleted file mode 100644 index 5e786dd941..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/padauk_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_closed.json deleted file mode 100644 index 0d1f96d949..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_open.json deleted file mode 100644 index 68283ab48b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_closed.json deleted file mode 100644 index 6087fa269c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_open.json deleted file mode 100644 index cd1da439ce..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/palm_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_closed.json deleted file mode 100644 index a21ba4be2e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_open.json deleted file mode 100644 index 323aface30..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_closed.json deleted file mode 100644 index 64496ab4fb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_open.json deleted file mode 100644 index 5c7ceef14f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/papaya_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_closed.json deleted file mode 100644 index a173e54828..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_open.json deleted file mode 100644 index 7d17b0ee02..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_closed.json deleted file mode 100644 index 3dca2c7f9d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_open.json deleted file mode 100644 index 8365718db5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/pine_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_closed.json deleted file mode 100644 index deb63d5ba5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_open.json deleted file mode 100644 index 9a05a143fd..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_closed.json deleted file mode 100644 index dd4ff19457..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_open.json deleted file mode 100644 index 793b45ab7e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/plum_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_closed.json deleted file mode 100644 index fe129bea98..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_open.json deleted file mode 100644 index 24ce6270a1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_closed.json deleted file mode 100644 index d79ddd506e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_open.json deleted file mode 100644 index f84e104b71..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/poplar_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_closed.json deleted file mode 100644 index 70e334ec01..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_open.json deleted file mode 100644 index 0ae44af74d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_closed.json deleted file mode 100644 index 259760e5ce..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_open.json deleted file mode 100644 index add8c50bbb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/sequoia_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_closed.json deleted file mode 100644 index c2232da922..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_open.json deleted file mode 100644 index c7bc724e64..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_closed.json deleted file mode 100644 index e8c32c0320..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_open.json deleted file mode 100644 index 9d5c0ef2a2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/teak_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_closed.json deleted file mode 100644 index 13efcb2953..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_open.json deleted file mode 100644 index e9e9b7c6c0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_closed.json deleted file mode 100644 index 2974624d2b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_open.json deleted file mode 100644 index db7aa0246d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/walnut_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_closed.json deleted file mode 100644 index 6ecdc2195d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_open.json deleted file mode 100644 index 9b59ffcf43..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_closed.json deleted file mode 100644 index 065420797f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_open.json deleted file mode 100644 index 961ea1e353..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/wenge_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_closed.json deleted file mode 100644 index a5386c8a65..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_open.json deleted file mode 100644 index 3adabc76d0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_closed.json deleted file mode 100644 index 35cf3c703f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_open.json deleted file mode 100644 index 6fd5e951bf..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/willow_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_closed.json deleted file mode 100644 index 50347c0349..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_open.json deleted file mode 100644 index 1cce5e6149..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_closed.json deleted file mode 100644 index 73492e0d9d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_closed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_closed", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_open.json deleted file mode 100644 index 562750a686..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/zebrawood_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/wall_gate_open", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_closed.json similarity index 67% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_closed.json index 6730be3b99..cb2494a6c3 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_closed.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_closed.json @@ -1,6 +1,7 @@ { "parent": "block/fence_gate_closed", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "texture": "forestry:blocks/wood/planks.acacia" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_open.json similarity index 66% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_open.json index ce08470732..70a9390897 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_open.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/fence_gate_open", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "texture": "forestry:blocks/wood/planks.acacia" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_closed.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_wall_closed.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_closed.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_wall_closed.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_open.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_wall_open.json similarity index 65% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_open.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_wall_open.json index 83878b4cd6..d6b41867ea 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate/acacia_wall_open.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fence_gate_wall_open.json @@ -1,5 +1,5 @@ { - "parent": "block/wall_gate_open", + "parent": "block/wall_gate_closed", "textures": { "texture": "forestry:blocks/wood/planks.acacia" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_inventory.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_inventory.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_inventory.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_inventory.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_post.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_post.json similarity index 65% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_post.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_post.json index 0c2ce36aab..e2636c662d 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_post.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "texture": "forestry:blocks/wood/planks.acacia" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/fence_side.json similarity index 65% rename from src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fence_side.json index 6b1d5b92bf..40d357ae72 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fence/acacia_side.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fence_side.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "texture": "forestry:blocks/wood/planks.acacia" } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/log.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/log/acacia.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa.json deleted file mode 100644 index 6df81c9862..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.balsa", - "end": "forestry:blocks/wood/heart.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_bark.json deleted file mode 100644 index c644290e54..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_side.json deleted file mode 100644 index a22f98edcc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/balsa_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.balsa", - "end": "forestry:blocks/wood/heart.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab.json deleted file mode 100644 index 659c2d2a79..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.baobab", - "end": "forestry:blocks/wood/heart.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_bark.json deleted file mode 100644 index 34972442f8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_side.json deleted file mode 100644 index 127b17b5c6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/baobab_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.baobab", - "end": "forestry:blocks/wood/heart.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry.json deleted file mode 100644 index a46c992d94..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.cherry", - "end": "forestry:blocks/wood/heart.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_bark.json deleted file mode 100644 index d38736c0a9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_side.json deleted file mode 100644 index aed70492a4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/cherry_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.cherry", - "end": "forestry:blocks/wood/heart.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut.json deleted file mode 100644 index 77924c363e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.chestnut", - "end": "forestry:blocks/wood/heart.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_bark.json deleted file mode 100644 index 0fac862a15..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_side.json deleted file mode 100644 index 147f185282..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/chestnut_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.chestnut", - "end": "forestry:blocks/wood/heart.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus.json deleted file mode 100644 index adb7febbe0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.citrus", - "end": "forestry:blocks/wood/heart.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_bark.json deleted file mode 100644 index 2bc9e32cab..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_side.json deleted file mode 100644 index 7c4b89e2e0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/citrus_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.citrus", - "end": "forestry:blocks/wood/heart.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo.json deleted file mode 100644 index 086a5e28bf..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.cocobolo", - "end": "forestry:blocks/wood/heart.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_bark.json deleted file mode 100644 index c3972b1649..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_side.json deleted file mode 100644 index e3a6a96683..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/cocobolo_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.cocobolo", - "end": "forestry:blocks/wood/heart.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony.json deleted file mode 100644 index 208c316421..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.ebony", - "end": "forestry:blocks/wood/heart.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_bark.json deleted file mode 100644 index 2fc73131dd..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_side.json deleted file mode 100644 index 5dc7b1d7ec..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/ebony_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.ebony", - "end": "forestry:blocks/wood/heart.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum.json deleted file mode 100644 index 3f73517cfc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.giganteum", - "end": "forestry:blocks/wood/heart.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_bark.json deleted file mode 100644 index 94dd30195e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_side.json deleted file mode 100644 index 1376808fe0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/giganteum_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.giganteum", - "end": "forestry:blocks/wood/heart.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart.json deleted file mode 100644 index 1493523d0b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.greenheart", - "end": "forestry:blocks/wood/heart.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_bark.json deleted file mode 100644 index 5d6cfc4acb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_side.json deleted file mode 100644 index fff33cfb10..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/greenheart_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.greenheart", - "end": "forestry:blocks/wood/heart.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe.json deleted file mode 100644 index f3ae498d3f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.ipe", - "end": "forestry:blocks/wood/heart.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_bark.json deleted file mode 100644 index afb4853e34..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_side.json deleted file mode 100644 index 36d3dd7cec..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/ipe_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.ipe", - "end": "forestry:blocks/wood/heart.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok.json deleted file mode 100644 index 05d23ac6d7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.kapok", - "end": "forestry:blocks/wood/heart.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_bark.json deleted file mode 100644 index f194fafbd1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_side.json deleted file mode 100644 index 00094ffeee..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/kapok_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.kapok", - "end": "forestry:blocks/wood/heart.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/larch.json deleted file mode 100644 index 81e0cbefd9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/larch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.larch", - "end": "forestry:blocks/wood/heart.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_bark.json deleted file mode 100644 index 50bee4043f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_side.json deleted file mode 100644 index 8e77258439..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/larch_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.larch", - "end": "forestry:blocks/wood/heart.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/lime.json deleted file mode 100644 index b4ec843ce3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/lime.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.lime", - "end": "forestry:blocks/wood/heart.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_bark.json deleted file mode 100644 index 028503c7a4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_side.json deleted file mode 100644 index 7c634adb4e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/lime_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.lime", - "end": "forestry:blocks/wood/heart.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe.json deleted file mode 100644 index eb84093584..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.mahoe", - "end": "forestry:blocks/wood/heart.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_bark.json deleted file mode 100644 index 58109a06e5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_side.json deleted file mode 100644 index 8ca85847a0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahoe_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.mahoe", - "end": "forestry:blocks/wood/heart.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany.json deleted file mode 100644 index d63f2a12a0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.mahogany", - "end": "forestry:blocks/wood/heart.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_bark.json deleted file mode 100644 index 1570483fad..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_side.json deleted file mode 100644 index cdb1d609e9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/mahogany_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.mahogany", - "end": "forestry:blocks/wood/heart.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/maple.json deleted file mode 100644 index 189beb922e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/maple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.maple", - "end": "forestry:blocks/wood/heart.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_bark.json deleted file mode 100644 index 7c9ffb150e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_side.json deleted file mode 100644 index 1baadba285..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/maple_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.maple", - "end": "forestry:blocks/wood/heart.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk.json deleted file mode 100644 index ea979af6ef..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.padauk", - "end": "forestry:blocks/wood/heart.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_bark.json deleted file mode 100644 index bdfbdc6946..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_side.json deleted file mode 100644 index e9288cc09e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/padauk_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.padauk", - "end": "forestry:blocks/wood/heart.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/palm.json deleted file mode 100644 index fa4c854e00..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/palm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.palm", - "end": "forestry:blocks/wood/heart.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_bark.json deleted file mode 100644 index b3f18ee8c0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_side.json deleted file mode 100644 index 52af3da410..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/palm_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.palm", - "end": "forestry:blocks/wood/heart.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya.json deleted file mode 100644 index c6c9cf7432..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.papaya", - "end": "forestry:blocks/wood/heart.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_bark.json deleted file mode 100644 index 15d1a91a7a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_side.json deleted file mode 100644 index cf7481917e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/papaya_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.papaya", - "end": "forestry:blocks/wood/heart.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/pine.json deleted file mode 100644 index 5396ef21f2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/pine.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.pine", - "end": "forestry:blocks/wood/heart.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_bark.json deleted file mode 100644 index 46dff02ab7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_side.json deleted file mode 100644 index ddd11109c1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/pine_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.pine", - "end": "forestry:blocks/wood/heart.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/plum.json deleted file mode 100644 index 25a5a18250..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/plum.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.plum", - "end": "forestry:blocks/wood/heart.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_bark.json deleted file mode 100644 index 439148239e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_side.json deleted file mode 100644 index 228e9b2f7a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/plum_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.plum", - "end": "forestry:blocks/wood/heart.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar.json deleted file mode 100644 index f897b05350..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.poplar", - "end": "forestry:blocks/wood/heart.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_bark.json deleted file mode 100644 index 95f9e91121..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_side.json deleted file mode 100644 index 25637a2d67..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/poplar_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.poplar", - "end": "forestry:blocks/wood/heart.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia.json deleted file mode 100644 index d96c7506b2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.sequoia", - "end": "forestry:blocks/wood/heart.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_bark.json deleted file mode 100644 index c20fb7f37c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_side.json deleted file mode 100644 index 373c9475d0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/sequoia_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.sequoia", - "end": "forestry:blocks/wood/heart.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/teak.json deleted file mode 100644 index 36ae7b947b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/teak.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.teak", - "end": "forestry:blocks/wood/heart.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_bark.json deleted file mode 100644 index 9794c764fc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_side.json deleted file mode 100644 index 8c253e4df9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/teak_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.teak", - "end": "forestry:blocks/wood/heart.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut.json deleted file mode 100644 index 95b25f3eec..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.walnut", - "end": "forestry:blocks/wood/heart.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_bark.json deleted file mode 100644 index 6dc8e7abb1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_side.json deleted file mode 100644 index 2c25ab3f16..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/walnut_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.walnut", - "end": "forestry:blocks/wood/heart.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge.json deleted file mode 100644 index 0b4c1ff24b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.wenge", - "end": "forestry:blocks/wood/heart.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_bark.json deleted file mode 100644 index 74d3a6ddd3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_side.json deleted file mode 100644 index 8206bd5015..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/wenge_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.wenge", - "end": "forestry:blocks/wood/heart.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/willow.json deleted file mode 100644 index f27f381215..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/willow.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.willow", - "end": "forestry:blocks/wood/heart.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_bark.json deleted file mode 100644 index 193eb11e5a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_side.json deleted file mode 100644 index 348b8c123c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/willow_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.willow", - "end": "forestry:blocks/wood/heart.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood.json deleted file mode 100644 index 86dd303326..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "side": "forestry:blocks/wood/bark.zebrawood", - "end": "forestry:blocks/wood/heart.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_bark.json deleted file mode 100644 index e69dac571a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_bark.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/bark.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_side.json deleted file mode 100644 index a595657193..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/log/zebrawood_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/column_side", - "textures": { - "side": "forestry:blocks/wood/bark.zebrawood", - "end": "forestry:blocks/wood/heart.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_bark.json b/src/main/resources/assets/forestry/models/block/arboriculture/log_bark.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_bark.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log_bark.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_side.json b/src/main/resources/assets/forestry/models/block/arboriculture/log_side.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/log/acacia_side.json rename to src/main/resources/assets/forestry/models/block/arboriculture/log_side.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks.json similarity index 100% rename from src/main/resources/assets/forestry/models/block/arboriculture/planks/acacia.json rename to src/main/resources/assets/forestry/models/block/arboriculture/planks.json diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json deleted file mode 100644 index ff26fde469..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/balsa.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json deleted file mode 100644 index 249da64c20..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/baobab.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json deleted file mode 100644 index aa9042123a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/cherry.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json deleted file mode 100644 index 4c31d88d52..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/chestnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json deleted file mode 100644 index c9e4575843..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/citrus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json deleted file mode 100644 index 180e8a8d70..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/cocobolo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json deleted file mode 100644 index 84e0d130be..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/ebony.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json deleted file mode 100644 index 42de110fad..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/giganteum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json deleted file mode 100644 index 039f98df26..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/greenheart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json deleted file mode 100644 index eb408ebcb4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/ipe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json deleted file mode 100644 index db437f6ce6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/kapok.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json deleted file mode 100644 index b9795c4524..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/larch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json deleted file mode 100644 index e8a6cebbcd..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/lime.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json deleted file mode 100644 index 183434162a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json deleted file mode 100644 index ce613d6191..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/mahogany.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json deleted file mode 100644 index 89cad9878b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/maple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json deleted file mode 100644 index 2f865b4a2d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/padauk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json deleted file mode 100644 index 5603706a17..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/palm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json deleted file mode 100644 index 813cb3a798..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/papaya.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json deleted file mode 100644 index 762b247382..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/pine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json deleted file mode 100644 index 8a66cad6d6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/plum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json deleted file mode 100644 index 3efe1eca34..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/poplar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json deleted file mode 100644 index db24043cee..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/sequoia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json deleted file mode 100644 index bab1890e40..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/teak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json deleted file mode 100644 index a4bdf4bd1f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/walnut.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json deleted file mode 100644 index 74633cf613..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/wenge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json deleted file mode 100644 index 47e448d62d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/willow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json deleted file mode 100644 index 1a67aacb65..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/planks/zebrawood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json deleted file mode 100644 index 63f348c7ee..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/acacia", - "textures": { - "side": "forestry:blocks/wood/planks.acacia", - "top": "forestry:blocks/wood/planks.acacia", - "bottom": "forestry:blocks/wood/planks.acacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json deleted file mode 100644 index 5bed89d23c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/balsa", - "textures": { - "side": "forestry:blocks/wood/planks.balsa", - "top": "forestry:blocks/wood/planks.balsa", - "bottom": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json deleted file mode 100644 index ebca8310f5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.balsa", - "top": "forestry:blocks/wood/planks.balsa", - "bottom": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json deleted file mode 100644 index 91e496a345..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/balsa_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.balsa", - "top": "forestry:blocks/wood/planks.balsa", - "bottom": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json deleted file mode 100644 index 323edcf9ec..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/baobab", - "textures": { - "side": "forestry:blocks/wood/planks.baobab", - "top": "forestry:blocks/wood/planks.baobab", - "bottom": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json deleted file mode 100644 index 49036b3675..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.baobab", - "top": "forestry:blocks/wood/planks.baobab", - "bottom": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json deleted file mode 100644 index f95c722f8d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/baobab_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.baobab", - "top": "forestry:blocks/wood/planks.baobab", - "bottom": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json deleted file mode 100644 index 4f342b8f2f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/cherry", - "textures": { - "side": "forestry:blocks/wood/planks.cherry", - "top": "forestry:blocks/wood/planks.cherry", - "bottom": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json deleted file mode 100644 index 8f66974cea..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.cherry", - "top": "forestry:blocks/wood/planks.cherry", - "bottom": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json deleted file mode 100644 index e14b4179ab..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cherry_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.cherry", - "top": "forestry:blocks/wood/planks.cherry", - "bottom": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json deleted file mode 100644 index ef1da93271..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/chestnut", - "textures": { - "side": "forestry:blocks/wood/planks.chestnut", - "top": "forestry:blocks/wood/planks.chestnut", - "bottom": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json deleted file mode 100644 index 67084ff58d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.chestnut", - "top": "forestry:blocks/wood/planks.chestnut", - "bottom": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json deleted file mode 100644 index f37b0fe6d6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/chestnut_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.chestnut", - "top": "forestry:blocks/wood/planks.chestnut", - "bottom": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json deleted file mode 100644 index e2cae7bb96..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/citrus", - "textures": { - "side": "forestry:blocks/wood/planks.citrus", - "top": "forestry:blocks/wood/planks.citrus", - "bottom": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json deleted file mode 100644 index a6f8fd3206..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.citrus", - "top": "forestry:blocks/wood/planks.citrus", - "bottom": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json deleted file mode 100644 index ed56cc21db..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/citrus_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.citrus", - "top": "forestry:blocks/wood/planks.citrus", - "bottom": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json deleted file mode 100644 index 7239216ce6..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/cocobolo", - "textures": { - "side": "forestry:blocks/wood/planks.cocobolo", - "top": "forestry:blocks/wood/planks.cocobolo", - "bottom": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json deleted file mode 100644 index 08822ca9d0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.cocobolo", - "top": "forestry:blocks/wood/planks.cocobolo", - "bottom": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json deleted file mode 100644 index 884f908c2c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/cocobolo_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.cocobolo", - "top": "forestry:blocks/wood/planks.cocobolo", - "bottom": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json deleted file mode 100644 index 2644644f94..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/ebony", - "textures": { - "side": "forestry:blocks/wood/planks.ebony", - "top": "forestry:blocks/wood/planks.ebony", - "bottom": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json deleted file mode 100644 index cde105619b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.ebony", - "top": "forestry:blocks/wood/planks.ebony", - "bottom": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json deleted file mode 100644 index 860445e11f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ebony_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.ebony", - "top": "forestry:blocks/wood/planks.ebony", - "bottom": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json deleted file mode 100644 index 337c961644..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/giganteum", - "textures": { - "side": "forestry:blocks/wood/planks.giganteum", - "top": "forestry:blocks/wood/planks.giganteum", - "bottom": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json deleted file mode 100644 index 1b4748ecac..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.giganteum", - "top": "forestry:blocks/wood/planks.giganteum", - "bottom": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json deleted file mode 100644 index 1593eb8823..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/giganteum_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.giganteum", - "top": "forestry:blocks/wood/planks.giganteum", - "bottom": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json deleted file mode 100644 index 4a1162852b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/greenheart", - "textures": { - "side": "forestry:blocks/wood/planks.greenheart", - "top": "forestry:blocks/wood/planks.greenheart", - "bottom": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json deleted file mode 100644 index ccdcd2f60a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.greenheart", - "top": "forestry:blocks/wood/planks.greenheart", - "bottom": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json deleted file mode 100644 index 9383cd364b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/greenheart_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.greenheart", - "top": "forestry:blocks/wood/planks.greenheart", - "bottom": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json deleted file mode 100644 index c6f717d0ab..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/ipe", - "textures": { - "side": "forestry:blocks/wood/planks.ipe", - "top": "forestry:blocks/wood/planks.ipe", - "bottom": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json deleted file mode 100644 index cdc6fea374..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.ipe", - "top": "forestry:blocks/wood/planks.ipe", - "bottom": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json deleted file mode 100644 index e8ce8c1cbe..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/ipe_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.ipe", - "top": "forestry:blocks/wood/planks.ipe", - "bottom": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json deleted file mode 100644 index 0f8dc3a677..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/kapok", - "textures": { - "side": "forestry:blocks/wood/planks.kapok", - "top": "forestry:blocks/wood/planks.kapok", - "bottom": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json deleted file mode 100644 index af1e50c85b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.kapok", - "top": "forestry:blocks/wood/planks.kapok", - "bottom": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json deleted file mode 100644 index f09964e196..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/kapok_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.kapok", - "top": "forestry:blocks/wood/planks.kapok", - "bottom": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json deleted file mode 100644 index 6104409379..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/larch", - "textures": { - "side": "forestry:blocks/wood/planks.larch", - "top": "forestry:blocks/wood/planks.larch", - "bottom": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json deleted file mode 100644 index 182698815d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.larch", - "top": "forestry:blocks/wood/planks.larch", - "bottom": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json deleted file mode 100644 index ab3cdfe9f2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/larch_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.larch", - "top": "forestry:blocks/wood/planks.larch", - "bottom": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json deleted file mode 100644 index e0155c210c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/lime", - "textures": { - "side": "forestry:blocks/wood/planks.lime", - "top": "forestry:blocks/wood/planks.lime", - "bottom": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json deleted file mode 100644 index a4c4fc1807..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.lime", - "top": "forestry:blocks/wood/planks.lime", - "bottom": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json deleted file mode 100644 index 85db8275ca..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/lime_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.lime", - "top": "forestry:blocks/wood/planks.lime", - "bottom": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json deleted file mode 100644 index eb5ced0d25..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/mahoe", - "textures": { - "side": "forestry:blocks/wood/planks.mahoe", - "top": "forestry:blocks/wood/planks.mahoe", - "bottom": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json deleted file mode 100644 index c869578a79..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.mahoe", - "top": "forestry:blocks/wood/planks.mahoe", - "bottom": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json deleted file mode 100644 index 3aa2f3e190..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahoe_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.mahoe", - "top": "forestry:blocks/wood/planks.mahoe", - "bottom": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json deleted file mode 100644 index b9fea06960..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/mahogany", - "textures": { - "side": "forestry:blocks/wood/planks.mahogany", - "top": "forestry:blocks/wood/planks.mahogany", - "bottom": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json deleted file mode 100644 index cbf87a5f21..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.mahogany", - "top": "forestry:blocks/wood/planks.mahogany", - "bottom": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json deleted file mode 100644 index bcc022bb33..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/mahogany_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.mahogany", - "top": "forestry:blocks/wood/planks.mahogany", - "bottom": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json deleted file mode 100644 index 2bd11ba309..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/maple", - "textures": { - "side": "forestry:blocks/wood/planks.maple", - "top": "forestry:blocks/wood/planks.maple", - "bottom": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json deleted file mode 100644 index 481669a8d3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.maple", - "top": "forestry:blocks/wood/planks.maple", - "bottom": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json deleted file mode 100644 index b6bf316816..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/maple_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.maple", - "top": "forestry:blocks/wood/planks.maple", - "bottom": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json deleted file mode 100644 index 1278141180..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/padauk", - "textures": { - "side": "forestry:blocks/wood/planks.padauk", - "top": "forestry:blocks/wood/planks.padauk", - "bottom": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json deleted file mode 100644 index fddf90366b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.padauk", - "top": "forestry:blocks/wood/planks.padauk", - "bottom": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json deleted file mode 100644 index 8105094133..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/padauk_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.padauk", - "top": "forestry:blocks/wood/planks.padauk", - "bottom": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json deleted file mode 100644 index 12678671f9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/palm", - "textures": { - "side": "forestry:blocks/wood/planks.palm", - "top": "forestry:blocks/wood/planks.palm", - "bottom": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json deleted file mode 100644 index 659bfa6a48..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.palm", - "top": "forestry:blocks/wood/planks.palm", - "bottom": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json deleted file mode 100644 index 4cef4edfde..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/palm_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.palm", - "top": "forestry:blocks/wood/planks.palm", - "bottom": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json deleted file mode 100644 index 4646f3c89f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/papaya", - "textures": { - "side": "forestry:blocks/wood/planks.papaya", - "top": "forestry:blocks/wood/planks.papaya", - "bottom": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json deleted file mode 100644 index 1f48d00fff..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.papaya", - "top": "forestry:blocks/wood/planks.papaya", - "bottom": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json deleted file mode 100644 index 1872448f9e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/papaya_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.papaya", - "top": "forestry:blocks/wood/planks.papaya", - "bottom": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json deleted file mode 100644 index 497bec9ee7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/pine", - "textures": { - "side": "forestry:blocks/wood/planks.pine", - "top": "forestry:blocks/wood/planks.pine", - "bottom": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json deleted file mode 100644 index 9449a410c4..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.pine", - "top": "forestry:blocks/wood/planks.pine", - "bottom": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json deleted file mode 100644 index 89a40e06e3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/pine_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.pine", - "top": "forestry:blocks/wood/planks.pine", - "bottom": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json deleted file mode 100644 index ff4df58787..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/plum", - "textures": { - "side": "forestry:blocks/wood/planks.plum", - "top": "forestry:blocks/wood/planks.plum", - "bottom": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json deleted file mode 100644 index 30f6ef7a52..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.plum", - "top": "forestry:blocks/wood/planks.plum", - "bottom": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json deleted file mode 100644 index 566892f186..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/plum_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.plum", - "top": "forestry:blocks/wood/planks.plum", - "bottom": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json deleted file mode 100644 index fd274600b0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/poplar", - "textures": { - "side": "forestry:blocks/wood/planks.poplar", - "top": "forestry:blocks/wood/planks.poplar", - "bottom": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json deleted file mode 100644 index bdb7985f92..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.poplar", - "top": "forestry:blocks/wood/planks.poplar", - "bottom": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json deleted file mode 100644 index 7dff37a506..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/poplar_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.poplar", - "top": "forestry:blocks/wood/planks.poplar", - "bottom": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json deleted file mode 100644 index 559ce859c9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/sequoia", - "textures": { - "side": "forestry:blocks/wood/planks.sequoia", - "top": "forestry:blocks/wood/planks.sequoia", - "bottom": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json deleted file mode 100644 index d195123f6c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.sequoia", - "top": "forestry:blocks/wood/planks.sequoia", - "bottom": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json deleted file mode 100644 index aa45d5a109..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/sequoia_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.sequoia", - "top": "forestry:blocks/wood/planks.sequoia", - "bottom": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json deleted file mode 100644 index 276b8595ac..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/teak", - "textures": { - "side": "forestry:blocks/wood/planks.teak", - "top": "forestry:blocks/wood/planks.teak", - "bottom": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json deleted file mode 100644 index c3714e5885..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.teak", - "top": "forestry:blocks/wood/planks.teak", - "bottom": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json deleted file mode 100644 index 97a5252105..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/teak_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.teak", - "top": "forestry:blocks/wood/planks.teak", - "bottom": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json deleted file mode 100644 index 8c31da8de7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/walnut", - "textures": { - "side": "forestry:blocks/wood/planks.walnut", - "top": "forestry:blocks/wood/planks.walnut", - "bottom": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json deleted file mode 100644 index aec7ceabac..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.walnut", - "top": "forestry:blocks/wood/planks.walnut", - "bottom": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json deleted file mode 100644 index 162ec3f833..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/walnut_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.walnut", - "top": "forestry:blocks/wood/planks.walnut", - "bottom": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json deleted file mode 100644 index 2ccddd1726..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/wenge", - "textures": { - "side": "forestry:blocks/wood/planks.wenge", - "top": "forestry:blocks/wood/planks.wenge", - "bottom": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json deleted file mode 100644 index b0435d6e77..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.wenge", - "top": "forestry:blocks/wood/planks.wenge", - "bottom": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json deleted file mode 100644 index 462cfb8295..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/wenge_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.wenge", - "top": "forestry:blocks/wood/planks.wenge", - "bottom": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json deleted file mode 100644 index a5d97500d7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/willow", - "textures": { - "side": "forestry:blocks/wood/planks.willow", - "top": "forestry:blocks/wood/planks.willow", - "bottom": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json deleted file mode 100644 index 0b7bd1946b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.willow", - "top": "forestry:blocks/wood/planks.willow", - "bottom": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json deleted file mode 100644 index 3c68661eb5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/willow_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.willow", - "top": "forestry:blocks/wood/planks.willow", - "bottom": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json deleted file mode 100644 index 5b444fc18b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_double.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/zebrawood", - "textures": { - "side": "forestry:blocks/wood/planks.zebrawood", - "top": "forestry:blocks/wood/planks.zebrawood", - "bottom": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json deleted file mode 100644 index 238f47a3a3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_half.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/half_slab", - "textures": { - "side": "forestry:blocks/wood/planks.zebrawood", - "top": "forestry:blocks/wood/planks.zebrawood", - "bottom": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json deleted file mode 100644 index fd48275c59..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/zebrawood_upper.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/upper_slab", - "textures": { - "side": "forestry:blocks/wood/planks.zebrawood", - "top": "forestry:blocks/wood/planks.zebrawood", - "bottom": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab_double.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab_double.json new file mode 100644 index 0000000000..3c566c3943 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "particle": "forestry:blocks/wood/planks.acacia", + "all": "forestry:blocks/wood/planks.acacia" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab_half.json similarity index 79% rename from src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json rename to src/main/resources/assets/forestry/models/block/arboriculture/slab_half.json index b0e77a684f..ac188f2039 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_half.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab_half.json @@ -1,6 +1,7 @@ { "parent": "block/half_slab", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "side": "forestry:blocks/wood/planks.acacia", "top": "forestry:blocks/wood/planks.acacia", "bottom": "forestry:blocks/wood/planks.acacia" diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json b/src/main/resources/assets/forestry/models/block/arboriculture/slab_upper.json similarity index 79% rename from src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json rename to src/main/resources/assets/forestry/models/block/arboriculture/slab_upper.json index 608081f210..9abef29510 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/slab/acacia_upper.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/slab_upper.json @@ -1,6 +1,7 @@ { "parent": "block/upper_slab", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "side": "forestry:blocks/wood/planks.acacia", "top": "forestry:blocks/wood/planks.acacia", "bottom": "forestry:blocks/wood/planks.acacia" diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs.json similarity index 79% rename from src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json rename to src/main/resources/assets/forestry/models/block/arboriculture/stairs.json index 0164bdc268..3bbc2d6141 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs.json @@ -1,6 +1,7 @@ { "parent": "block/stairs", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "side": "forestry:blocks/wood/planks.acacia", "top": "forestry:blocks/wood/planks.acacia", "bottom": "forestry:blocks/wood/planks.acacia" diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json deleted file mode 100644 index 29fdf46158..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.balsa", - "top": "forestry:blocks/wood/planks.balsa", - "bottom": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json deleted file mode 100644 index 87170b8970..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.balsa", - "top": "forestry:blocks/wood/planks.balsa", - "bottom": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json deleted file mode 100644 index 9dc3249f4d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/balsa_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.balsa", - "top": "forestry:blocks/wood/planks.balsa", - "bottom": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json deleted file mode 100644 index ab389d55e1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.baobab", - "top": "forestry:blocks/wood/planks.baobab", - "bottom": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json deleted file mode 100644 index 4019e43693..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.baobab", - "top": "forestry:blocks/wood/planks.baobab", - "bottom": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json deleted file mode 100644 index 27dd2f0db0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/baobab_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.baobab", - "top": "forestry:blocks/wood/planks.baobab", - "bottom": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json deleted file mode 100644 index cbe3dd3f2d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.cherry", - "top": "forestry:blocks/wood/planks.cherry", - "bottom": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json deleted file mode 100644 index 32e49dd85e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.cherry", - "top": "forestry:blocks/wood/planks.cherry", - "bottom": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json deleted file mode 100644 index 9d8fac1564..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cherry_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.cherry", - "top": "forestry:blocks/wood/planks.cherry", - "bottom": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json deleted file mode 100644 index 251034b3f8..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.chestnut", - "top": "forestry:blocks/wood/planks.chestnut", - "bottom": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json deleted file mode 100644 index dfa18cc7fc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.chestnut", - "top": "forestry:blocks/wood/planks.chestnut", - "bottom": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json deleted file mode 100644 index 46bdd8f58d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/chestnut_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.chestnut", - "top": "forestry:blocks/wood/planks.chestnut", - "bottom": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json deleted file mode 100644 index 5f9a99ab38..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.citrus", - "top": "forestry:blocks/wood/planks.citrus", - "bottom": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json deleted file mode 100644 index 2fcb772c32..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.citrus", - "top": "forestry:blocks/wood/planks.citrus", - "bottom": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json deleted file mode 100644 index a9cce210a3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/citrus_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.citrus", - "top": "forestry:blocks/wood/planks.citrus", - "bottom": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json deleted file mode 100644 index 9c3dd2f277..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.cocobolo", - "top": "forestry:blocks/wood/planks.cocobolo", - "bottom": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json deleted file mode 100644 index 3efb0fa4bd..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.cocobolo", - "top": "forestry:blocks/wood/planks.cocobolo", - "bottom": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json deleted file mode 100644 index 599f2279a3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/cocobolo_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.cocobolo", - "top": "forestry:blocks/wood/planks.cocobolo", - "bottom": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json deleted file mode 100644 index c38fd3e295..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.ebony", - "top": "forestry:blocks/wood/planks.ebony", - "bottom": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json deleted file mode 100644 index 98e2d3d88d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.ebony", - "top": "forestry:blocks/wood/planks.ebony", - "bottom": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json deleted file mode 100644 index 668d5190e7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ebony_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.ebony", - "top": "forestry:blocks/wood/planks.ebony", - "bottom": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json deleted file mode 100644 index 0ae5697594..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.giganteum", - "top": "forestry:blocks/wood/planks.giganteum", - "bottom": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json deleted file mode 100644 index 94971cdf59..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.giganteum", - "top": "forestry:blocks/wood/planks.giganteum", - "bottom": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json deleted file mode 100644 index cf11e9b5c9..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/giganteum_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.giganteum", - "top": "forestry:blocks/wood/planks.giganteum", - "bottom": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json deleted file mode 100644 index f91e68194e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.greenheart", - "top": "forestry:blocks/wood/planks.greenheart", - "bottom": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json deleted file mode 100644 index 13620aa75e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.greenheart", - "top": "forestry:blocks/wood/planks.greenheart", - "bottom": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json deleted file mode 100644 index 355bde3bcd..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/greenheart_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.greenheart", - "top": "forestry:blocks/wood/planks.greenheart", - "bottom": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json deleted file mode 100644 index c078f78b6e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.ipe", - "top": "forestry:blocks/wood/planks.ipe", - "bottom": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json deleted file mode 100644 index 387b5cb287..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.ipe", - "top": "forestry:blocks/wood/planks.ipe", - "bottom": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json deleted file mode 100644 index 8629edbbc3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/ipe_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.ipe", - "top": "forestry:blocks/wood/planks.ipe", - "bottom": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json deleted file mode 100644 index 8c443915fc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.kapok", - "top": "forestry:blocks/wood/planks.kapok", - "bottom": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json deleted file mode 100644 index 768f60c08b..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.kapok", - "top": "forestry:blocks/wood/planks.kapok", - "bottom": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json deleted file mode 100644 index 4f6f1ffdc1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/kapok_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.kapok", - "top": "forestry:blocks/wood/planks.kapok", - "bottom": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json deleted file mode 100644 index cbe17ea26e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.larch", - "top": "forestry:blocks/wood/planks.larch", - "bottom": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json deleted file mode 100644 index 60184270e5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.larch", - "top": "forestry:blocks/wood/planks.larch", - "bottom": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json deleted file mode 100644 index 0a413e2c4f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/larch_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.larch", - "top": "forestry:blocks/wood/planks.larch", - "bottom": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json deleted file mode 100644 index aa9c497fad..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.lime", - "top": "forestry:blocks/wood/planks.lime", - "bottom": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json deleted file mode 100644 index 06abc9838d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.lime", - "top": "forestry:blocks/wood/planks.lime", - "bottom": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json deleted file mode 100644 index e92633623e..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/lime_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.lime", - "top": "forestry:blocks/wood/planks.lime", - "bottom": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json deleted file mode 100644 index 7df01c44bb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.mahoe", - "top": "forestry:blocks/wood/planks.mahoe", - "bottom": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json deleted file mode 100644 index 3af77c21d0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.mahoe", - "top": "forestry:blocks/wood/planks.mahoe", - "bottom": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json deleted file mode 100644 index f706d69a9a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahoe_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.mahoe", - "top": "forestry:blocks/wood/planks.mahoe", - "bottom": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json deleted file mode 100644 index a8f522e823..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.mahogany", - "top": "forestry:blocks/wood/planks.mahogany", - "bottom": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json deleted file mode 100644 index 249a6ec95f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.mahogany", - "top": "forestry:blocks/wood/planks.mahogany", - "bottom": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json deleted file mode 100644 index 81737bce51..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/mahogany_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.mahogany", - "top": "forestry:blocks/wood/planks.mahogany", - "bottom": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json deleted file mode 100644 index f5fff3ff18..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.maple", - "top": "forestry:blocks/wood/planks.maple", - "bottom": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json deleted file mode 100644 index eb62d6680f..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.maple", - "top": "forestry:blocks/wood/planks.maple", - "bottom": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json deleted file mode 100644 index a3cd1864d2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/maple_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.maple", - "top": "forestry:blocks/wood/planks.maple", - "bottom": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json deleted file mode 100644 index e1022a8063..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.padauk", - "top": "forestry:blocks/wood/planks.padauk", - "bottom": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json deleted file mode 100644 index 83c54c11ab..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.padauk", - "top": "forestry:blocks/wood/planks.padauk", - "bottom": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json deleted file mode 100644 index ae4fa2ebd7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/padauk_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.padauk", - "top": "forestry:blocks/wood/planks.padauk", - "bottom": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json deleted file mode 100644 index 8ace4b6345..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.palm", - "top": "forestry:blocks/wood/planks.palm", - "bottom": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json deleted file mode 100644 index 3b88c2bb0c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.palm", - "top": "forestry:blocks/wood/planks.palm", - "bottom": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json deleted file mode 100644 index 7b5e86dee7..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/palm_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.palm", - "top": "forestry:blocks/wood/planks.palm", - "bottom": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json deleted file mode 100644 index 97cd895678..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.papaya", - "top": "forestry:blocks/wood/planks.papaya", - "bottom": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json deleted file mode 100644 index 5a4dd41d33..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.papaya", - "top": "forestry:blocks/wood/planks.papaya", - "bottom": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json deleted file mode 100644 index f2001c08e0..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/papaya_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.papaya", - "top": "forestry:blocks/wood/planks.papaya", - "bottom": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json deleted file mode 100644 index c06ee39f64..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.pine", - "top": "forestry:blocks/wood/planks.pine", - "bottom": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json deleted file mode 100644 index 1e19ad6ecf..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.pine", - "top": "forestry:blocks/wood/planks.pine", - "bottom": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json deleted file mode 100644 index 406ff1d90c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/pine_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.pine", - "top": "forestry:blocks/wood/planks.pine", - "bottom": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json deleted file mode 100644 index 49cc48757c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.plum", - "top": "forestry:blocks/wood/planks.plum", - "bottom": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json deleted file mode 100644 index 594ac9e463..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.plum", - "top": "forestry:blocks/wood/planks.plum", - "bottom": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json deleted file mode 100644 index eb4f198d93..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/plum_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.plum", - "top": "forestry:blocks/wood/planks.plum", - "bottom": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json deleted file mode 100644 index d398f063ac..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.poplar", - "top": "forestry:blocks/wood/planks.poplar", - "bottom": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json deleted file mode 100644 index c9967eef8d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.poplar", - "top": "forestry:blocks/wood/planks.poplar", - "bottom": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json deleted file mode 100644 index 518636defc..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/poplar_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.poplar", - "top": "forestry:blocks/wood/planks.poplar", - "bottom": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json deleted file mode 100644 index ed6f9706c1..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.sequoia", - "top": "forestry:blocks/wood/planks.sequoia", - "bottom": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json deleted file mode 100644 index 65b5b0a41a..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.sequoia", - "top": "forestry:blocks/wood/planks.sequoia", - "bottom": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json deleted file mode 100644 index b1fff730ff..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/sequoia_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.sequoia", - "top": "forestry:blocks/wood/planks.sequoia", - "bottom": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json deleted file mode 100644 index f4606bcbb5..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.teak", - "top": "forestry:blocks/wood/planks.teak", - "bottom": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json deleted file mode 100644 index 0e696046cb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.teak", - "top": "forestry:blocks/wood/planks.teak", - "bottom": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json deleted file mode 100644 index 41fb4ddfbb..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/teak_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.teak", - "top": "forestry:blocks/wood/planks.teak", - "bottom": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json deleted file mode 100644 index 7155beed68..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.walnut", - "top": "forestry:blocks/wood/planks.walnut", - "bottom": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json deleted file mode 100644 index 6135216611..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.walnut", - "top": "forestry:blocks/wood/planks.walnut", - "bottom": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json deleted file mode 100644 index 197182c384..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/walnut_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.walnut", - "top": "forestry:blocks/wood/planks.walnut", - "bottom": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json deleted file mode 100644 index 98dce7d6e2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.wenge", - "top": "forestry:blocks/wood/planks.wenge", - "bottom": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json deleted file mode 100644 index d236771d97..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.wenge", - "top": "forestry:blocks/wood/planks.wenge", - "bottom": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json deleted file mode 100644 index fbac9e17db..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/wenge_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.wenge", - "top": "forestry:blocks/wood/planks.wenge", - "bottom": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json deleted file mode 100644 index 1cc874c8b3..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.willow", - "top": "forestry:blocks/wood/planks.willow", - "bottom": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json deleted file mode 100644 index f3d9368590..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.willow", - "top": "forestry:blocks/wood/planks.willow", - "bottom": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json deleted file mode 100644 index 27ec353ae2..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/willow_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.willow", - "top": "forestry:blocks/wood/planks.willow", - "bottom": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json deleted file mode 100644 index 89ed7ef83d..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "side": "forestry:blocks/wood/planks.zebrawood", - "top": "forestry:blocks/wood/planks.zebrawood", - "bottom": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json deleted file mode 100644 index 1413ca548c..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.zebrawood", - "top": "forestry:blocks/wood/planks.zebrawood", - "bottom": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json deleted file mode 100644 index 9f39905c06..0000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/zebrawood_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "side": "forestry:blocks/wood/planks.zebrawood", - "top": "forestry:blocks/wood/planks.zebrawood", - "bottom": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs_inner.json similarity index 79% rename from src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json rename to src/main/resources/assets/forestry/models/block/arboriculture/stairs_inner.json index 358a150746..a57201dd0b 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_inner.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs_inner.json @@ -1,6 +1,7 @@ { "parent": "block/inner_stairs", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "side": "forestry:blocks/wood/planks.acacia", "top": "forestry:blocks/wood/planks.acacia", "bottom": "forestry:blocks/wood/planks.acacia" diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json b/src/main/resources/assets/forestry/models/block/arboriculture/stairs_outer.json similarity index 79% rename from src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json rename to src/main/resources/assets/forestry/models/block/arboriculture/stairs_outer.json index 5ea6826ef6..92e8e4d7ac 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/stairs/acacia_outer.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/stairs_outer.json @@ -1,6 +1,7 @@ { "parent": "block/outer_stairs", "textures": { + "particle": "forestry:blocks/wood/planks.acacia", "side": "forestry:blocks/wood/planks.acacia", "top": "forestry:blocks/wood/planks.acacia", "bottom": "forestry:blocks/wood/planks.acacia" diff --git a/src/main/resources/assets/forestry/models/item/door.json b/src/main/resources/assets/forestry/models/item/door.json new file mode 100644 index 0000000000..053ee62811 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/door.json @@ -0,0 +1,18 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "forestry:items/doors/acacia" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/fence.json b/src/main/resources/assets/forestry/models/item/fence.json new file mode 100644 index 0000000000..cf8a79160a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/fence.json @@ -0,0 +1,3 @@ +{ + "parent": "forestry:block/arboriculture/fence_inventory" +} diff --git a/src/main/resources/assets/forestry/models/item/fence/acacia.json b/src/main/resources/assets/forestry/models/item/fence/acacia.json deleted file mode 100644 index aee478b714..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/acacia.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index c808efda0c..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/balsa.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 7480689297..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/baobab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 5439991b15..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/cherry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 9f74fea562..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/chestnut.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 99a92fe932..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/citrus.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index b3751174ad..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/cocobolo.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 93769720df..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/ebony.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index fd0c3a3f66..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/giganteum.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 73f1dfd153..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/greenheart.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index b4a2ef5815..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/ipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 40a509e775..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/kapok.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 88b8206e74..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/larch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index f740a5b5d1..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/lime.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index e8c1ab5ad5..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/mahoe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index ff50573aff..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/mahogany.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 06c0e9c721..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/maple.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 258cc1392e..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/padauk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 1f81aba71a..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/palm.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 51ae5ba13a..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/papaya.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 3feb0f15cd..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/pine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 559a1c754c..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/plum.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index bcd913e214..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/poplar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 66f623bce9..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/sequoia.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index cd6f0e8e18..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/teak.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 5c42fd5475..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/walnut.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 21c21a5144..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/wenge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index b7bd2c83c4..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/willow.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 61d43fbe0d..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence/zebrawood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence/zebrawood_inventory" -} diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/ipe.json b/src/main/resources/assets/forestry/models/item/fence_gate.json similarity index 87% rename from src/main/resources/assets/forestry/models/item/fence_gate/ipe.json rename to src/main/resources/assets/forestry/models/item/fence_gate.json index fae3e6e21c..72c588845f 100644 --- a/src/main/resources/assets/forestry/models/item/fence_gate/ipe.json +++ b/src/main/resources/assets/forestry/models/item/fence_gate.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/fence_gate/ipe_closed", + "parent": "forestry:block/arboriculture/fence_gate_closed", "display": { "firstperson": { "rotation": [ diff --git a/src/main/resources/assets/forestry/models/item/fence_gate/acacia.json b/src/main/resources/assets/forestry/models/item/fence_gate/acacia.json deleted file mode 100644 index 830a0de643..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/acacia.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/acacia_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/balsa.json b/src/main/resources/assets/forestry/models/item/fence_gate/balsa.json deleted file mode 100644 index db6ee982a8..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/balsa.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/balsa_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/baobab.json b/src/main/resources/assets/forestry/models/item/fence_gate/baobab.json deleted file mode 100644 index 995e4056b4..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/baobab.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/baobab_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/cherry.json b/src/main/resources/assets/forestry/models/item/fence_gate/cherry.json deleted file mode 100644 index 9a9e363b98..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/cherry.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/cherry_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/chestnut.json b/src/main/resources/assets/forestry/models/item/fence_gate/chestnut.json deleted file mode 100644 index 00b9aac191..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/chestnut.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/chestnut_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/citrus.json b/src/main/resources/assets/forestry/models/item/fence_gate/citrus.json deleted file mode 100644 index bec3f29581..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/citrus.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/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_gate/cocobolo.json b/src/main/resources/assets/forestry/models/item/fence_gate/cocobolo.json deleted file mode 100644 index 2f7d79edb3..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/cocobolo.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/cocobolo_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/ebony.json b/src/main/resources/assets/forestry/models/item/fence_gate/ebony.json deleted file mode 100644 index 9a39fa8307..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/ebony.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/ebony_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/giganteum.json b/src/main/resources/assets/forestry/models/item/fence_gate/giganteum.json deleted file mode 100644 index 483504cd9a..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/giganteum.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/giganteum_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/greenheart.json b/src/main/resources/assets/forestry/models/item/fence_gate/greenheart.json deleted file mode 100644 index 47c92a1f3e..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/greenheart.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/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_gate/kapok.json b/src/main/resources/assets/forestry/models/item/fence_gate/kapok.json deleted file mode 100644 index 851f30bc81..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/kapok.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/kapok_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/larch.json b/src/main/resources/assets/forestry/models/item/fence_gate/larch.json deleted file mode 100644 index ba1a78b655..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/larch.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/larch_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/lime.json b/src/main/resources/assets/forestry/models/item/fence_gate/lime.json deleted file mode 100644 index f46790781a..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/lime.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/lime_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/mahoe.json b/src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json deleted file mode 100644 index c0c4e361c5..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/mahoe.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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_gate/mahogany.json b/src/main/resources/assets/forestry/models/item/fence_gate/mahogany.json deleted file mode 100644 index ac16925c7a..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/mahogany.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/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_gate/maple.json b/src/main/resources/assets/forestry/models/item/fence_gate/maple.json deleted file mode 100644 index e5177a951c..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/maple.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index a458d4e88a..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/padauk.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index a3bf590cae..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/palm.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index 89cae7d431..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/papaya.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index a781a8e7de..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/pine.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index ada6a4c5c6..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/plum.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index 697ff4f814..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/poplar.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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_gate/sequoia.json b/src/main/resources/assets/forestry/models/item/fence_gate/sequoia.json deleted file mode 100644 index 29d19169c3..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/sequoia.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/sequoia_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/teak.json b/src/main/resources/assets/forestry/models/item/fence_gate/teak.json deleted file mode 100644 index adc09eba11..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/teak.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/teak_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/walnut.json b/src/main/resources/assets/forestry/models/item/fence_gate/walnut.json deleted file mode 100644 index 0030754d15..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/walnut.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index 5826984f15..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/wenge.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 deleted file mode 100644 index 76c93044eb..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/willow.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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_gate/zebrawood.json b/src/main/resources/assets/forestry/models/item/fence_gate/zebrawood.json deleted file mode 100644 index 786f4ea590..0000000000 --- a/src/main/resources/assets/forestry/models/item/fence_gate/zebrawood.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/fence_gate/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/planks/ipe.json b/src/main/resources/assets/forestry/models/item/log.json similarity index 77% rename from src/main/resources/assets/forestry/models/item/planks/ipe.json rename to src/main/resources/assets/forestry/models/item/log.json index 105de00a3b..75bf22ea45 100644 --- a/src/main/resources/assets/forestry/models/item/planks/ipe.json +++ b/src/main/resources/assets/forestry/models/item/log.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/planks/ipe", + "parent": "forestry:block/arboriculture/log", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/planks.json b/src/main/resources/assets/forestry/models/item/planks.json index f3edb15137..286b8daafb 100644 --- a/src/main/resources/assets/forestry/models/item/planks.json +++ b/src/main/resources/assets/forestry/models/item/planks.json @@ -5,9 +5,6 @@ "rotation": [ 10, -45, 170 ], "translation": [ 0, 1.5, -2.75 ], "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] } } } diff --git a/src/main/resources/assets/forestry/models/item/planks/acacia.json b/src/main/resources/assets/forestry/models/item/planks/acacia.json deleted file mode 100644 index bf7041f431..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/acacia.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/acacia", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/balsa.json b/src/main/resources/assets/forestry/models/item/planks/balsa.json deleted file mode 100644 index 00fc17562f..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/balsa.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/balsa", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/baobab.json b/src/main/resources/assets/forestry/models/item/planks/baobab.json deleted file mode 100644 index d71fbb1737..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/baobab.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/baobab", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/cherry.json b/src/main/resources/assets/forestry/models/item/planks/cherry.json deleted file mode 100644 index 7444e5e98c..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/cherry.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/cherry", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/chestnut.json b/src/main/resources/assets/forestry/models/item/planks/chestnut.json deleted file mode 100644 index 1cda39ac37..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/chestnut.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/chestnut", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/citrus.json b/src/main/resources/assets/forestry/models/item/planks/citrus.json deleted file mode 100644 index b6f85517d4..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/citrus.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/citrus", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/cocobolo.json b/src/main/resources/assets/forestry/models/item/planks/cocobolo.json deleted file mode 100644 index bdd390ef1e..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/cocobolo.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/cocobolo", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/ebony.json b/src/main/resources/assets/forestry/models/item/planks/ebony.json deleted file mode 100644 index 4404dcbce3..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/ebony.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/ebony", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/giganteum.json b/src/main/resources/assets/forestry/models/item/planks/giganteum.json deleted file mode 100644 index 9650a8ffdf..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/giganteum.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/giganteum", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/greenheart.json b/src/main/resources/assets/forestry/models/item/planks/greenheart.json deleted file mode 100644 index efac925095..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/greenheart.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/greenheart", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/kapok.json b/src/main/resources/assets/forestry/models/item/planks/kapok.json deleted file mode 100644 index a65f436391..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/kapok.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/kapok", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/larch.json b/src/main/resources/assets/forestry/models/item/planks/larch.json deleted file mode 100644 index 30388a20ac..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/larch.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/larch", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/mahoe.json b/src/main/resources/assets/forestry/models/item/planks/mahoe.json deleted file mode 100644 index f03ab2028a..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/mahoe.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/mahoe", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/mahogany.json b/src/main/resources/assets/forestry/models/item/planks/mahogany.json deleted file mode 100644 index 6e95fb43ad..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/mahogany.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/mahogany", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/maple.json b/src/main/resources/assets/forestry/models/item/planks/maple.json deleted file mode 100644 index 7178135b14..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/maple.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/maple", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/padauk.json b/src/main/resources/assets/forestry/models/item/planks/padauk.json deleted file mode 100644 index 0364e7cfbd..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/padauk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/padauk", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/palm.json b/src/main/resources/assets/forestry/models/item/planks/palm.json deleted file mode 100644 index 3d537a517a..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/palm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/palm", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/papaya.json b/src/main/resources/assets/forestry/models/item/planks/papaya.json deleted file mode 100644 index a97ddb57b4..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/papaya.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/papaya", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/pine.json b/src/main/resources/assets/forestry/models/item/planks/pine.json deleted file mode 100644 index 75a6534226..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/pine.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/pine", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/plum.json b/src/main/resources/assets/forestry/models/item/planks/plum.json deleted file mode 100644 index c04badf8af..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/plum.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/plum", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/poplar.json b/src/main/resources/assets/forestry/models/item/planks/poplar.json deleted file mode 100644 index 66c0558c0e..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/poplar.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/poplar", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/sequoia.json b/src/main/resources/assets/forestry/models/item/planks/sequoia.json deleted file mode 100644 index 509c60cb52..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/sequoia.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/sequoia", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/teak.json b/src/main/resources/assets/forestry/models/item/planks/teak.json deleted file mode 100644 index 5c9fea3770..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/teak.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/teak", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/walnut.json b/src/main/resources/assets/forestry/models/item/planks/walnut.json deleted file mode 100644 index 0a4c002727..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/walnut.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/walnut", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/wenge.json b/src/main/resources/assets/forestry/models/item/planks/wenge.json deleted file mode 100644 index a90bac3c0d..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/wenge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/wenge", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/willow.json b/src/main/resources/assets/forestry/models/item/planks/willow.json deleted file mode 100644 index b08089fa4a..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/willow.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/willow", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/zebrawood.json b/src/main/resources/assets/forestry/models/item/planks/zebrawood.json deleted file mode 100644 index 4de6e32b71..0000000000 --- a/src/main/resources/assets/forestry/models/item/planks/zebrawood.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/planks/zebrawood", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/planks/lime.json b/src/main/resources/assets/forestry/models/item/slab.json similarity index 77% rename from src/main/resources/assets/forestry/models/item/planks/lime.json rename to src/main/resources/assets/forestry/models/item/slab.json index 7b221008a0..6ff0f7aaa7 100644 --- a/src/main/resources/assets/forestry/models/item/planks/lime.json +++ b/src/main/resources/assets/forestry/models/item/slab.json @@ -1,5 +1,5 @@ { - "parent": "forestry:block/arboriculture/planks/lime", + "parent": "forestry:block/arboriculture/slab_half", "display": { "thirdperson": { "rotation": [ 10, -45, 170 ], diff --git a/src/main/resources/assets/forestry/models/item/slab/acacia.json b/src/main/resources/assets/forestry/models/item/slab/acacia.json deleted file mode 100644 index a2940cc5cc..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/acacia.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/acacia_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/balsa.json b/src/main/resources/assets/forestry/models/item/slab/balsa.json deleted file mode 100644 index 0012801322..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/balsa.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/balsa_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/baobab.json b/src/main/resources/assets/forestry/models/item/slab/baobab.json deleted file mode 100644 index 9a947a478f..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/baobab.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/baobab_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/cherry.json b/src/main/resources/assets/forestry/models/item/slab/cherry.json deleted file mode 100644 index 8f8b27a923..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/cherry.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/cherry_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/chestnut.json b/src/main/resources/assets/forestry/models/item/slab/chestnut.json deleted file mode 100644 index 81f4efe2b3..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/chestnut.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/chestnut_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/citrus.json b/src/main/resources/assets/forestry/models/item/slab/citrus.json deleted file mode 100644 index 0ae8ba4c41..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/citrus.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/citrus_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/cocobolo.json b/src/main/resources/assets/forestry/models/item/slab/cocobolo.json deleted file mode 100644 index 572c12fc22..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/cocobolo.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/cocobolo_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/ebony.json b/src/main/resources/assets/forestry/models/item/slab/ebony.json deleted file mode 100644 index 9199a1043e..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/ebony.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/ebony_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/giganteum.json b/src/main/resources/assets/forestry/models/item/slab/giganteum.json deleted file mode 100644 index 4784966a70..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/giganteum.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/giganteum_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/greenheart.json b/src/main/resources/assets/forestry/models/item/slab/greenheart.json deleted file mode 100644 index d3a9dadd9a..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/greenheart.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/greenheart_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/ipe.json b/src/main/resources/assets/forestry/models/item/slab/ipe.json deleted file mode 100644 index 510c7bbcb3..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/ipe.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/ipe_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/kapok.json b/src/main/resources/assets/forestry/models/item/slab/kapok.json deleted file mode 100644 index 35e031cb20..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/kapok.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/kapok_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/larch.json b/src/main/resources/assets/forestry/models/item/slab/larch.json deleted file mode 100644 index e246f0e5df..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/larch.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/larch_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/lime.json b/src/main/resources/assets/forestry/models/item/slab/lime.json deleted file mode 100644 index aab1c8b56b..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/lime.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/lime_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/mahoe.json b/src/main/resources/assets/forestry/models/item/slab/mahoe.json deleted file mode 100644 index f89966b0d2..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/mahoe.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/mahoe_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/mahogany.json b/src/main/resources/assets/forestry/models/item/slab/mahogany.json deleted file mode 100644 index 797c214c00..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/mahogany.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/mahogany_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/maple.json b/src/main/resources/assets/forestry/models/item/slab/maple.json deleted file mode 100644 index 5e98e77ee9..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/maple.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/maple_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/padauk.json b/src/main/resources/assets/forestry/models/item/slab/padauk.json deleted file mode 100644 index 2de4ef5af9..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/padauk.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/padauk_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/palm.json b/src/main/resources/assets/forestry/models/item/slab/palm.json deleted file mode 100644 index ecf06d4d7d..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/palm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/palm_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/papaya.json b/src/main/resources/assets/forestry/models/item/slab/papaya.json deleted file mode 100644 index ad67bd5c7b..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/papaya.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/papaya_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/pine.json b/src/main/resources/assets/forestry/models/item/slab/pine.json deleted file mode 100644 index 2494bb06d5..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/pine.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/pine_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/plum.json b/src/main/resources/assets/forestry/models/item/slab/plum.json deleted file mode 100644 index b247f57b28..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/plum.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/plum_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/poplar.json b/src/main/resources/assets/forestry/models/item/slab/poplar.json deleted file mode 100644 index 6a00d6b212..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/poplar.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/poplar_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/sequoia.json b/src/main/resources/assets/forestry/models/item/slab/sequoia.json deleted file mode 100644 index 9d6531798a..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/sequoia.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/sequoia_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/teak.json b/src/main/resources/assets/forestry/models/item/slab/teak.json deleted file mode 100644 index 14d9f0e9f1..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/teak.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/teak_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/walnut.json b/src/main/resources/assets/forestry/models/item/slab/walnut.json deleted file mode 100644 index 28da3a3344..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/walnut.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/walnut_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/wenge.json b/src/main/resources/assets/forestry/models/item/slab/wenge.json deleted file mode 100644 index 85eda7945d..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/wenge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/wenge_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/willow.json b/src/main/resources/assets/forestry/models/item/slab/willow.json deleted file mode 100644 index 7f60ff2e2c..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/willow.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/willow_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/slab/zebrawood.json b/src/main/resources/assets/forestry/models/item/slab/zebrawood.json deleted file mode 100644 index 97e7e5b980..0000000000 --- a/src/main/resources/assets/forestry/models/item/slab/zebrawood.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/slab/zebrawood_half", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} diff --git a/src/main/resources/assets/forestry/models/item/stairs.json b/src/main/resources/assets/forestry/models/item/stairs.json index b1ca6ff7b4..5cf369ff09 100644 --- a/src/main/resources/assets/forestry/models/item/stairs.json +++ b/src/main/resources/assets/forestry/models/item/stairs.json @@ -5,9 +5,6 @@ "rotation": [ 10, -45, 170 ], "translation": [ 0, 1.5, -2.75 ], "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 180, 0 ] } } } diff --git a/src/main/resources/assets/forestry/models/item/stairs/acacia.json b/src/main/resources/assets/forestry/models/item/stairs/acacia.json deleted file mode 100644 index a3d7309313..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/acacia.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/acacia" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/balsa.json b/src/main/resources/assets/forestry/models/item/stairs/balsa.json deleted file mode 100644 index 50d97c437b..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/balsa.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/balsa" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/baobab.json b/src/main/resources/assets/forestry/models/item/stairs/baobab.json deleted file mode 100644 index b42293332b..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/baobab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/baobab" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/cherry.json b/src/main/resources/assets/forestry/models/item/stairs/cherry.json deleted file mode 100644 index 234af0f768..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/cherry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/cherry" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/chestnut.json b/src/main/resources/assets/forestry/models/item/stairs/chestnut.json deleted file mode 100644 index dbef379fcc..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/chestnut.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/chestnut" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/citrus.json b/src/main/resources/assets/forestry/models/item/stairs/citrus.json deleted file mode 100644 index 3f3031d6f8..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/citrus.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/citrus" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/cocobolo.json b/src/main/resources/assets/forestry/models/item/stairs/cocobolo.json deleted file mode 100644 index 13cb997dcb..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/cocobolo.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/cocobolo" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/ebony.json b/src/main/resources/assets/forestry/models/item/stairs/ebony.json deleted file mode 100644 index b2f33af878..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/ebony.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/ebony" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/giganteum.json b/src/main/resources/assets/forestry/models/item/stairs/giganteum.json deleted file mode 100644 index 119f0ca0af..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/giganteum.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/giganteum" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/greenheart.json b/src/main/resources/assets/forestry/models/item/stairs/greenheart.json deleted file mode 100644 index 719c78d76b..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/greenheart.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/greenheart" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/ipe.json b/src/main/resources/assets/forestry/models/item/stairs/ipe.json deleted file mode 100644 index 761b7ed541..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/ipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/ipe" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/kapok.json b/src/main/resources/assets/forestry/models/item/stairs/kapok.json deleted file mode 100644 index 1e78704068..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/kapok.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/kapok" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/larch.json b/src/main/resources/assets/forestry/models/item/stairs/larch.json deleted file mode 100644 index 65af20f4d2..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/larch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/larch" -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/stairs/lime.json b/src/main/resources/assets/forestry/models/item/stairs/lime.json deleted file mode 100644 index 04dfa8a4a3..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/lime.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/lime" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/mahoe.json b/src/main/resources/assets/forestry/models/item/stairs/mahoe.json deleted file mode 100644 index 517ec07b2d..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/mahoe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/mahoe" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/mahogany.json b/src/main/resources/assets/forestry/models/item/stairs/mahogany.json deleted file mode 100644 index cd8dd94fed..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/mahogany.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/mahogany" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/maple.json b/src/main/resources/assets/forestry/models/item/stairs/maple.json deleted file mode 100644 index bc56cc834d..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/maple.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/maple" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/padauk.json b/src/main/resources/assets/forestry/models/item/stairs/padauk.json deleted file mode 100644 index 13abb37449..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/padauk.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/padauk" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/palm.json b/src/main/resources/assets/forestry/models/item/stairs/palm.json deleted file mode 100644 index a0a9479d4f..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/palm.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/palm" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/papaya.json b/src/main/resources/assets/forestry/models/item/stairs/papaya.json deleted file mode 100644 index 94664d11a3..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/papaya.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/papaya" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/pine.json b/src/main/resources/assets/forestry/models/item/stairs/pine.json deleted file mode 100644 index 8fe415a256..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/pine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/pine" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/plum.json b/src/main/resources/assets/forestry/models/item/stairs/plum.json deleted file mode 100644 index 5efc01a4ef..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/plum.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/plum" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/poplar.json b/src/main/resources/assets/forestry/models/item/stairs/poplar.json deleted file mode 100644 index ceb1f1e8e1..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/poplar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/poplar" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/sequoia.json b/src/main/resources/assets/forestry/models/item/stairs/sequoia.json deleted file mode 100644 index 4ff913d1ee..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/sequoia.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/sequoia" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/teak.json b/src/main/resources/assets/forestry/models/item/stairs/teak.json deleted file mode 100644 index ff6ba75ec9..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/teak.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/teak" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/walnut.json b/src/main/resources/assets/forestry/models/item/stairs/walnut.json deleted file mode 100644 index e207f73e52..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/walnut.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/walnut" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/wenge.json b/src/main/resources/assets/forestry/models/item/stairs/wenge.json deleted file mode 100644 index d962dc3a83..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/wenge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/wenge" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/willow.json b/src/main/resources/assets/forestry/models/item/stairs/willow.json deleted file mode 100644 index d2877c4cb5..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/willow.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/willow" -} diff --git a/src/main/resources/assets/forestry/models/item/stairs/zebrawood.json b/src/main/resources/assets/forestry/models/item/stairs/zebrawood.json deleted file mode 100644 index e042eb67c0..0000000000 --- a/src/main/resources/assets/forestry/models/item/stairs/zebrawood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "forestry:block/arboriculture/stairs/zebrawood" -}