From db2d534d5200739679f0b80c9186acc1cd19c54d Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 5 May 2016 17:17:28 -0700 Subject: [PATCH] Fix fence rendering --- .../arboriculture/blocks/BlockArbFence.java | 5 ++- .../arboriculture/fences/acacia.json | 33 +++++++++---------- .../arboriculture/fences/balsa.json | 33 +++++++++---------- .../arboriculture/fences/baobab.json | 33 +++++++++---------- .../arboriculture/fences/cherry.json | 33 +++++++++---------- .../arboriculture/fences/chestnut.json | 33 +++++++++---------- .../arboriculture/fences/citrus.json | 33 +++++++++---------- .../arboriculture/fences/cocobolo.json | 33 +++++++++---------- .../arboriculture/fences/ebony.json | 33 +++++++++---------- .../arboriculture/fences/giganteum.json | 33 +++++++++---------- .../arboriculture/fences/greenheart.json | 33 +++++++++---------- .../blockstates/arboriculture/fences/ipe.json | 33 +++++++++---------- .../arboriculture/fences/kapok.json | 33 +++++++++---------- .../arboriculture/fences/larch.json | 33 +++++++++---------- .../arboriculture/fences/lime.json | 33 +++++++++---------- .../arboriculture/fences/mahoe.json | 33 +++++++++---------- .../arboriculture/fences/mahogany.json | 33 +++++++++---------- .../arboriculture/fences/maple.json | 33 +++++++++---------- .../arboriculture/fences/padauk.json | 33 +++++++++---------- .../arboriculture/fences/palm.json | 33 +++++++++---------- .../arboriculture/fences/papaya.json | 33 +++++++++---------- .../arboriculture/fences/pine.json | 33 +++++++++---------- .../arboriculture/fences/plum.json | 33 +++++++++---------- .../arboriculture/fences/poplar.json | 33 +++++++++---------- .../arboriculture/fences/sequoia.json | 33 +++++++++---------- .../arboriculture/fences/teak.json | 33 +++++++++---------- .../arboriculture/fences/walnut.json | 33 +++++++++---------- .../arboriculture/fences/wenge.json | 33 +++++++++---------- .../arboriculture/fences/willow.json | 33 +++++++++---------- .../arboriculture/fences/zebrawood.json | 33 +++++++++---------- .../block/arboriculture/fences/acacia_ne.json | 6 ---- .../block/arboriculture/fences/acacia_ns.json | 6 ---- .../arboriculture/fences/acacia_nse.json | 6 ---- .../arboriculture/fences/acacia_nsew.json | 6 ---- .../{acacia_n.json => acacia_side.json} | 2 +- .../block/arboriculture/fences/balsa_ne.json | 6 ---- .../block/arboriculture/fences/balsa_ns.json | 6 ---- .../block/arboriculture/fences/balsa_nse.json | 6 ---- .../arboriculture/fences/balsa_nsew.json | 6 ---- .../fences/{balsa_n.json => balsa_side.json} | 2 +- .../block/arboriculture/fences/baobab_ne.json | 6 ---- .../block/arboriculture/fences/baobab_ns.json | 6 ---- .../arboriculture/fences/baobab_nse.json | 6 ---- .../arboriculture/fences/baobab_nsew.json | 6 ---- .../{baobab_n.json => baobab_side.json} | 2 +- .../block/arboriculture/fences/cherry_ne.json | 6 ---- .../block/arboriculture/fences/cherry_ns.json | 6 ---- .../arboriculture/fences/cherry_nse.json | 6 ---- .../arboriculture/fences/cherry_nsew.json | 6 ---- .../{cherry_n.json => cherry_side.json} | 2 +- .../arboriculture/fences/chestnut_ne.json | 6 ---- .../arboriculture/fences/chestnut_ns.json | 6 ---- .../arboriculture/fences/chestnut_nse.json | 6 ---- .../arboriculture/fences/chestnut_nsew.json | 6 ---- .../{chestnut_n.json => chestnut_side.json} | 2 +- .../block/arboriculture/fences/citrus_ne.json | 6 ---- .../block/arboriculture/fences/citrus_ns.json | 6 ---- .../arboriculture/fences/citrus_nse.json | 6 ---- .../arboriculture/fences/citrus_nsew.json | 6 ---- .../{citrus_n.json => citrus_side.json} | 2 +- .../arboriculture/fences/cocobolo_ne.json | 6 ---- .../arboriculture/fences/cocobolo_ns.json | 6 ---- .../arboriculture/fences/cocobolo_nse.json | 6 ---- .../arboriculture/fences/cocobolo_nsew.json | 6 ---- .../{cocobolo_n.json => cocobolo_side.json} | 2 +- .../block/arboriculture/fences/ebony_ne.json | 6 ---- .../block/arboriculture/fences/ebony_ns.json | 6 ---- .../block/arboriculture/fences/ebony_nse.json | 6 ---- .../arboriculture/fences/ebony_nsew.json | 6 ---- .../fences/{ebony_n.json => ebony_side.json} | 2 +- .../arboriculture/fences/giganteum_ne.json | 6 ---- .../arboriculture/fences/giganteum_ns.json | 6 ---- .../arboriculture/fences/giganteum_nse.json | 6 ---- .../arboriculture/fences/giganteum_nsew.json | 6 ---- .../{giganteum_n.json => giganteum_side.json} | 2 +- .../arboriculture/fences/greenheart_ne.json | 6 ---- .../arboriculture/fences/greenheart_ns.json | 6 ---- .../arboriculture/fences/greenheart_nse.json | 6 ---- .../arboriculture/fences/greenheart_nsew.json | 6 ---- ...greenheart_n.json => greenheart_side.json} | 2 +- .../block/arboriculture/fences/ipe_ne.json | 6 ---- .../block/arboriculture/fences/ipe_ns.json | 6 ---- .../block/arboriculture/fences/ipe_nse.json | 6 ---- .../block/arboriculture/fences/ipe_nsew.json | 6 ---- .../fences/{ipe_n.json => ipe_side.json} | 2 +- .../block/arboriculture/fences/kapok_ne.json | 6 ---- .../block/arboriculture/fences/kapok_ns.json | 6 ---- .../block/arboriculture/fences/kapok_nse.json | 6 ---- .../arboriculture/fences/kapok_nsew.json | 6 ---- .../fences/{kapok_n.json => kapok_side.json} | 2 +- .../block/arboriculture/fences/larch_ne.json | 6 ---- .../block/arboriculture/fences/larch_ns.json | 6 ---- .../block/arboriculture/fences/larch_nse.json | 6 ---- .../arboriculture/fences/larch_nsew.json | 6 ---- .../fences/{larch_n.json => larch_side.json} | 2 +- .../block/arboriculture/fences/lime_ne.json | 6 ---- .../block/arboriculture/fences/lime_ns.json | 6 ---- .../block/arboriculture/fences/lime_nse.json | 6 ---- .../block/arboriculture/fences/lime_nsew.json | 6 ---- .../fences/{lime_n.json => lime_side.json} | 2 +- .../block/arboriculture/fences/mahoe_ne.json | 6 ---- .../block/arboriculture/fences/mahoe_ns.json | 6 ---- .../block/arboriculture/fences/mahoe_nse.json | 6 ---- .../arboriculture/fences/mahoe_nsew.json | 6 ---- .../fences/{mahoe_n.json => mahoe_side.json} | 2 +- .../arboriculture/fences/mahogany_ne.json | 6 ---- .../arboriculture/fences/mahogany_ns.json | 6 ---- .../arboriculture/fences/mahogany_nse.json | 6 ---- .../arboriculture/fences/mahogany_nsew.json | 6 ---- .../{mahogany_n.json => mahogany_side.json} | 2 +- .../block/arboriculture/fences/maple_ne.json | 6 ---- .../block/arboriculture/fences/maple_ns.json | 6 ---- .../block/arboriculture/fences/maple_nse.json | 6 ---- .../arboriculture/fences/maple_nsew.json | 6 ---- .../fences/{maple_n.json => maple_side.json} | 2 +- .../block/arboriculture/fences/padauk_ne.json | 6 ---- .../block/arboriculture/fences/padauk_ns.json | 6 ---- .../arboriculture/fences/padauk_nse.json | 6 ---- .../arboriculture/fences/padauk_nsew.json | 6 ---- .../{padauk_n.json => padauk_side.json} | 2 +- .../block/arboriculture/fences/palm_ne.json | 6 ---- .../block/arboriculture/fences/palm_ns.json | 6 ---- .../block/arboriculture/fences/palm_nse.json | 6 ---- .../block/arboriculture/fences/palm_nsew.json | 6 ---- .../fences/{palm_n.json => palm_side.json} | 2 +- .../block/arboriculture/fences/papaya_ne.json | 6 ---- .../block/arboriculture/fences/papaya_ns.json | 6 ---- .../arboriculture/fences/papaya_nse.json | 6 ---- .../arboriculture/fences/papaya_nsew.json | 6 ---- .../{papaya_n.json => papaya_side.json} | 2 +- .../block/arboriculture/fences/pine_ne.json | 6 ---- .../block/arboriculture/fences/pine_ns.json | 6 ---- .../block/arboriculture/fences/pine_nse.json | 6 ---- .../block/arboriculture/fences/pine_nsew.json | 6 ---- .../fences/{pine_n.json => pine_side.json} | 2 +- .../block/arboriculture/fences/plum_ne.json | 6 ---- .../block/arboriculture/fences/plum_ns.json | 6 ---- .../block/arboriculture/fences/plum_nse.json | 6 ---- .../block/arboriculture/fences/plum_nsew.json | 6 ---- .../fences/{plum_n.json => plum_side.json} | 2 +- .../block/arboriculture/fences/poplar_ne.json | 6 ---- .../block/arboriculture/fences/poplar_ns.json | 6 ---- .../arboriculture/fences/poplar_nse.json | 6 ---- .../arboriculture/fences/poplar_nsew.json | 6 ---- .../{poplar_n.json => poplar_side.json} | 2 +- .../arboriculture/fences/sequoia_ne.json | 6 ---- .../arboriculture/fences/sequoia_ns.json | 6 ---- .../arboriculture/fences/sequoia_nse.json | 6 ---- .../arboriculture/fences/sequoia_nsew.json | 6 ---- .../{sequoia_n.json => sequoia_side.json} | 2 +- .../block/arboriculture/fences/teak_ne.json | 6 ---- .../block/arboriculture/fences/teak_ns.json | 6 ---- .../block/arboriculture/fences/teak_nse.json | 6 ---- .../block/arboriculture/fences/teak_nsew.json | 6 ---- .../fences/{teak_n.json => teak_side.json} | 2 +- .../block/arboriculture/fences/walnut_ne.json | 6 ---- .../block/arboriculture/fences/walnut_ns.json | 6 ---- .../arboriculture/fences/walnut_nse.json | 6 ---- .../arboriculture/fences/walnut_nsew.json | 6 ---- .../{walnut_n.json => walnut_side.json} | 2 +- .../block/arboriculture/fences/wenge_ne.json | 6 ---- .../block/arboriculture/fences/wenge_ns.json | 6 ---- .../block/arboriculture/fences/wenge_nse.json | 6 ---- .../arboriculture/fences/wenge_nsew.json | 6 ---- .../fences/{wenge_n.json => wenge_side.json} | 2 +- .../block/arboriculture/fences/willow_ne.json | 6 ---- .../block/arboriculture/fences/willow_ns.json | 6 ---- .../arboriculture/fences/willow_nse.json | 6 ---- .../arboriculture/fences/willow_nsew.json | 6 ---- .../{willow_n.json => willow_side.json} | 2 +- .../arboriculture/fences/zebrawood_ne.json | 6 ---- .../arboriculture/fences/zebrawood_ns.json | 6 ---- .../arboriculture/fences/zebrawood_nse.json | 6 ---- .../arboriculture/fences/zebrawood_nsew.json | 6 ---- .../{zebrawood_n.json => zebrawood_side.json} | 2 +- .../forestry/models/item/fences/acacia.json | 12 +------ .../forestry/models/item/fences/balsa.json | 12 +------ .../forestry/models/item/fences/baobab.json | 12 +------ .../forestry/models/item/fences/cherry.json | 12 +------ .../forestry/models/item/fences/chestnut.json | 12 +------ .../forestry/models/item/fences/citrus.json | 12 +------ .../forestry/models/item/fences/cocobolo.json | 12 +------ .../forestry/models/item/fences/ebony.json | 12 +------ .../models/item/fences/giganteum.json | 12 +------ .../models/item/fences/greenheart.json | 12 +------ .../forestry/models/item/fences/ipe.json | 12 +------ .../forestry/models/item/fences/kapok.json | 12 +------ .../forestry/models/item/fences/larch.json | 12 +------ .../forestry/models/item/fences/lime.json | 12 +------ .../forestry/models/item/fences/mahoe.json | 12 +------ .../forestry/models/item/fences/mahogany.json | 12 +------ .../forestry/models/item/fences/maple.json | 12 +------ .../forestry/models/item/fences/padauk.json | 12 +------ .../forestry/models/item/fences/palm.json | 12 +------ .../forestry/models/item/fences/papaya.json | 12 +------ .../forestry/models/item/fences/pine.json | 12 +------ .../forestry/models/item/fences/plum.json | 12 +------ .../forestry/models/item/fences/poplar.json | 12 +------ .../forestry/models/item/fences/sequoia.json | 12 +------ .../forestry/models/item/fences/teak.json | 12 +------ .../forestry/models/item/fences/walnut.json | 12 +------ .../forestry/models/item/fences/wenge.json | 12 +------ .../forestry/models/item/fences/willow.json | 12 +------ .../models/item/fences/zebrawood.json | 12 +------ 204 files changed, 497 insertions(+), 1567 deletions(-) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{acacia_n.json => acacia_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{balsa_n.json => balsa_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{baobab_n.json => baobab_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{cherry_n.json => cherry_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{chestnut_n.json => chestnut_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{citrus_n.json => citrus_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{cocobolo_n.json => cocobolo_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{ebony_n.json => ebony_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{giganteum_n.json => giganteum_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{greenheart_n.json => greenheart_side.json} (71%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{ipe_n.json => ipe_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{kapok_n.json => kapok_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{larch_n.json => larch_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{lime_n.json => lime_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{mahoe_n.json => mahoe_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{mahogany_n.json => mahogany_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{maple_n.json => maple_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{padauk_n.json => padauk_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{palm_n.json => palm_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{papaya_n.json => papaya_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{pine_n.json => pine_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{plum_n.json => plum_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{poplar_n.json => poplar_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{sequoia_n.json => sequoia_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{teak_n.json => teak_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{walnut_n.json => walnut_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{wenge_n.json => wenge_side.json} (69%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{willow_n.json => willow_side.json} (70%) delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json delete mode 100644 src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json rename src/main/resources/assets/forestry/models/block/arboriculture/fences/{zebrawood_n.json => zebrawood_side.json} (70%) diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index d7cdfbbc2..270a6aea6 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -110,12 +110,15 @@ public abstract class BlockArbFence extends BlockFence implements IWoodTyped, II public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { IBlockState blockState = worldIn.getBlockState(pos); Block block = blockState.getBlock(); - if (PluginArboriculture.validFences.contains(block) || block instanceof BlockFence || block instanceof BlockFenceGate) { + if (PluginArboriculture.validFences.contains(block)) { return true; } if (block != Blocks.BARRIER) { Material blockMaterial = block.getMaterial(blockState); + if (block instanceof BlockFence || block instanceof BlockFenceGate) { + return blockMaterial == this.blockMaterial; + } if (blockMaterial.isOpaque() && blockState.isFullCube() && blockMaterial != Material.GOURD) { return true; } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json index ab8f81403..992bd6b50 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/acacia.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/acacia_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/acacia_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/acacia_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/acacia_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/acacia_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/acacia_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/acacia_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/acacia_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/acacia_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/acacia_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/acacia_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/acacia_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/acacia_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/acacia_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/acacia_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/acacia_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/acacia_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json index c8760e458..b96b7f880 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/balsa.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/balsa_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/balsa_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/balsa_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/balsa_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/balsa_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/balsa_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/balsa_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/balsa_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/balsa_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/balsa_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/balsa_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/balsa_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/balsa_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/balsa_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/balsa_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/balsa_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/balsa_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json index 6245ff32c..3da3b0037 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/baobab.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/baobab_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/baobab_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/baobab_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/baobab_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/baobab_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/baobab_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/baobab_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/baobab_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/baobab_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/baobab_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/baobab_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/baobab_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/baobab_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/baobab_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/baobab_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/baobab_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/baobab_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json index 0de2f5817..ae385c30a 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cherry.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/cherry_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/cherry_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/cherry_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/cherry_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/cherry_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/cherry_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/cherry_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/cherry_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/cherry_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/cherry_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/cherry_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/cherry_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/cherry_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cherry_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cherry_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cherry_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cherry_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json index 9471eba62..718da7783 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/chestnut.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/chestnut_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/chestnut_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/chestnut_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/chestnut_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/chestnut_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/chestnut_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/chestnut_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/chestnut_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/chestnut_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/chestnut_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/chestnut_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/chestnut_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json index 945fdeac0..c95017741 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/citrus.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/citrus_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/citrus_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/citrus_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/citrus_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/citrus_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/citrus_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/citrus_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/citrus_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/citrus_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/citrus_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/citrus_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/citrus_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/citrus_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/citrus_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/citrus_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/citrus_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/citrus_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json index 04464f8c6..4b1465635 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/cocobolo.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/cocobolo_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/cocobolo_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/cocobolo_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/cocobolo_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/cocobolo_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/cocobolo_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/cocobolo_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/cocobolo_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/cocobolo_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/cocobolo_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/cocobolo_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/cocobolo_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json index 6021693d7..08e651f24 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ebony.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/ebony_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/ebony_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/ebony_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/ebony_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/ebony_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/ebony_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/ebony_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/ebony_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/ebony_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/ebony_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/ebony_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/ebony_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/ebony_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ebony_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ebony_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ebony_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ebony_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json index cbb7a603d..9e79f2c2a 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/giganteum.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/giganteum_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/giganteum_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/giganteum_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/giganteum_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/giganteum_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/giganteum_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/giganteum_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/giganteum_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/giganteum_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/giganteum_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/giganteum_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/giganteum_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json index 0c469bc68..6506b06f9 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/greenheart.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/greenheart_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/greenheart_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/greenheart_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/greenheart_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/greenheart_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/greenheart_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/greenheart_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/greenheart_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/greenheart_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/greenheart_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/greenheart_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/greenheart_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json index 2650b56f6..663ddad37 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/ipe.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/ipe_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/ipe_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/ipe_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/ipe_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/ipe_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/ipe_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/ipe_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/ipe_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/ipe_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/ipe_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/ipe_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/ipe_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/ipe_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ipe_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ipe_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ipe_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/ipe_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json index 504b501ae..c6609457e 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/kapok.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/kapok_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/kapok_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/kapok_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/kapok_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/kapok_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/kapok_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/kapok_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/kapok_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/kapok_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/kapok_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/kapok_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/kapok_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/kapok_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/kapok_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/kapok_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/kapok_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/kapok_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json index 80d1cf5d4..25985118c 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/larch.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/larch_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/larch_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/larch_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/larch_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/larch_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/larch_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/larch_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/larch_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/larch_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/larch_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/larch_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/larch_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/larch_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/larch_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/larch_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/larch_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/larch_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/larch_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/larch_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/larch_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/larch_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json index 1d2f19dbe..2beaa3f53 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/lime.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/lime_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/lime_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/lime_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/lime_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/lime_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/lime_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/lime_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/lime_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/lime_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/lime_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/lime_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/lime_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/lime_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/lime_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/lime_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/lime_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/lime_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/lime_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/lime_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/lime_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/lime_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json index 340007a5b..390327f4b 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahoe.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/mahoe_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/mahoe_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/mahoe_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/mahoe_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/mahoe_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/mahoe_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/mahoe_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/mahoe_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/mahoe_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/mahoe_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/mahoe_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahoe_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json index aef9f9e0e..ab6af8574 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/mahogany.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/mahogany_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/mahogany_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/mahogany_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/mahogany_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/mahogany_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/mahogany_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/mahogany_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/mahogany_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/mahogany_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/mahogany_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/mahogany_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/mahogany_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json index 3c9f4ded4..4896ec320 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/maple.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/maple_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/maple_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/maple_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/maple_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/maple_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/maple_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/maple_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/maple_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/maple_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/maple_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/maple_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/maple_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/maple_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/maple_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/maple_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/maple_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/maple_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/maple_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/maple_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/maple_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/maple_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json index 2d1e8d32a..826fd475b 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/padauk.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/padauk_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/padauk_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/padauk_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/padauk_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/padauk_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/padauk_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/padauk_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/padauk_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/padauk_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/padauk_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/padauk_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/padauk_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/padauk_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/padauk_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/padauk_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/padauk_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/padauk_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json index b85c02393..fdc0c73be 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/palm.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/palm_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/palm_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/palm_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/palm_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/palm_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/palm_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/palm_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/palm_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/palm_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/palm_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/palm_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/palm_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/palm_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/palm_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/palm_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/palm_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/palm_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/palm_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/palm_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/palm_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/palm_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json index f56dffca9..c31b14a88 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/papaya.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/papaya_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/papaya_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/papaya_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/papaya_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/papaya_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/papaya_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/papaya_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/papaya_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/papaya_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/papaya_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/papaya_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/papaya_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/papaya_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/papaya_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/papaya_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/papaya_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/papaya_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json index f52d8907d..349013c45 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/pine.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/pine_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/pine_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/pine_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/pine_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/pine_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/pine_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/pine_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/pine_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/pine_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/pine_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/pine_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/pine_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/pine_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/pine_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/pine_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/pine_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/pine_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/pine_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/pine_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/pine_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/pine_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json index 05767ee08..e32e65be4 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/plum.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/plum_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/plum_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/plum_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/plum_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/plum_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/plum_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/plum_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/plum_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/plum_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/plum_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/plum_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/plum_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/plum_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/plum_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/plum_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/plum_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/plum_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/plum_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/plum_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/plum_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/plum_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json index 0c91c274b..a779f62b6 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/poplar.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/poplar_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/poplar_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/poplar_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/poplar_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/poplar_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/poplar_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/poplar_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/poplar_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/poplar_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/poplar_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/poplar_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/poplar_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/poplar_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/poplar_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/poplar_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/poplar_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/poplar_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json index eae709052..67a781d43 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/sequoia.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/sequoia_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/sequoia_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/sequoia_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/sequoia_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/sequoia_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/sequoia_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/sequoia_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/sequoia_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/sequoia_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/sequoia_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/sequoia_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/sequoia_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json index 907b20155..07fa2ddfb 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/teak.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/teak_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/teak_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/teak_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/teak_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/teak_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/teak_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/teak_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/teak_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/teak_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/teak_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/teak_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/teak_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/teak_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/teak_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/teak_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/teak_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/teak_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/teak_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/teak_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/teak_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/teak_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json index 3b16f6bce..9cf12d171 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/walnut.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/walnut_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/walnut_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/walnut_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/walnut_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/walnut_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/walnut_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/walnut_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/walnut_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/walnut_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/walnut_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/walnut_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/walnut_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/walnut_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/walnut_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/walnut_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/walnut_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/walnut_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json index 24ad2ef35..2edc04c48 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/wenge.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/wenge_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/wenge_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/wenge_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/wenge_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/wenge_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/wenge_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/wenge_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/wenge_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/wenge_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/wenge_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/wenge_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/wenge_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/wenge_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/wenge_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/wenge_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/wenge_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/wenge_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json index 0d7acb1d0..3be61d1e2 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/willow.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/willow_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/willow_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/willow_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/willow_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/willow_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/willow_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/willow_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/willow_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/willow_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/willow_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/willow_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/willow_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/willow_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/willow_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/willow_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/willow_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/willow_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/willow_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/willow_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/willow_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/willow_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json index 7272424c7..61e8aec08 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/fences/zebrawood.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/zebrawood_post" }, - "east=false,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/zebrawood_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/zebrawood_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "forestry:arboriculture/fences/zebrawood_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/zebrawood_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/zebrawood_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "forestry:arboriculture/fences/zebrawood_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "forestry:arboriculture/fences/zebrawood_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "forestry:arboriculture/fences/zebrawood_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "forestry:arboriculture/fences/zebrawood_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "forestry:arboriculture/fences/zebrawood_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "forestry:arboriculture/fences/zebrawood_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json deleted file mode 100644 index b85abbab0..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.acacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json deleted file mode 100644 index 582d485e2..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.acacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json deleted file mode 100644 index cb511a238..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.acacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json deleted file mode 100644 index ba7700e74..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.acacia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_side.json index becd0661d..6b1d5b92b 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/acacia_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.acacia" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json deleted file mode 100644 index 28a966533..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json deleted file mode 100644 index ecafb5f58..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json deleted file mode 100644 index cc77ba388..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json deleted file mode 100644 index 6b730579c..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.balsa" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_side.json index ff88c71ec..67c813bec 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/balsa_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.balsa" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json deleted file mode 100644 index b25a659d8..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json deleted file mode 100644 index e501c1396..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json deleted file mode 100644 index 0c0ed4737..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json deleted file mode 100644 index 3564f1f27..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.baobab" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_side.json index 5624a11e5..afd341f5f 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/baobab_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.baobab" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json deleted file mode 100644 index 899d40db7..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json deleted file mode 100644 index ceba657b4..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json deleted file mode 100644 index ef9c4e364..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json deleted file mode 100644 index ad959c059..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.cherry" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_side.json index ac7655e30..e819aee39 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cherry_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.cherry" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json deleted file mode 100644 index 090c5041a..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json deleted file mode 100644 index ac313d46b..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json deleted file mode 100644 index c14bc34cf..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json deleted file mode 100644 index aeebbc262..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.chestnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_side.json index 24ebd3621..86397812d 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/chestnut_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.chestnut" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json deleted file mode 100644 index c3b9941f8..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json deleted file mode 100644 index c469c0e50..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json deleted file mode 100644 index c48e8a385..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json deleted file mode 100644 index b1d8ce01a..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.citrus" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_side.json index 5889c462d..38f1f6e7d 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/citrus_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.citrus" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json deleted file mode 100644 index 3cfb3907e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json deleted file mode 100644 index b25d099b1..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json deleted file mode 100644 index af86c277c..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json deleted file mode 100644 index 0264b0473..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.cocobolo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_side.json index a0e430cd3..8bfb2fef8 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/cocobolo_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.cocobolo" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json deleted file mode 100644 index 9a0fdde24..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json deleted file mode 100644 index f0961a346..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json deleted file mode 100644 index 392fda1d0..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json deleted file mode 100644 index 0edcf97fe..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.ebony" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_side.json index 117c61c74..2cf07af40 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ebony_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.ebony" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json deleted file mode 100644 index df5bfaea6..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json deleted file mode 100644 index 2320b615e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json deleted file mode 100644 index c60d46c0f..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json deleted file mode 100644 index 74d2b6309..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.giganteum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_side.json index d07e430c8..2720b4cef 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/giganteum_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.giganteum" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json deleted file mode 100644 index 3f56d1f4b..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json deleted file mode 100644 index ff26d1498..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json deleted file mode 100644 index 0f2c41b40..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json deleted file mode 100644 index 56840d84d..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.greenheart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_side.json similarity index 71% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_side.json index 6500608fd..0af48958b 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/greenheart_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.greenheart" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json deleted file mode 100644 index d5eada253..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json deleted file mode 100644 index 305ec2b74..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json deleted file mode 100644 index 0694dd24a..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json deleted file mode 100644 index 9a29b6140..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.ipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_side.json index 528305290..bcc710b89 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/ipe_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.ipe" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json deleted file mode 100644 index 316d650d7..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json deleted file mode 100644 index 0b3c8fc21..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json deleted file mode 100644 index 1e0368f14..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json deleted file mode 100644 index de6ee5b1e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.kapok" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_side.json index 49a0949f2..081d67df9 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/kapok_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.kapok" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json deleted file mode 100644 index 3ed45644f..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json deleted file mode 100644 index c192c9e65..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json deleted file mode 100644 index 3a8f5df80..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json deleted file mode 100644 index b66ddfa86..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.larch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_side.json index 9d23a7898..9d9e7d9d0 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/larch_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.larch" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json deleted file mode 100644 index 998464a50..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json deleted file mode 100644 index 763323c23..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json deleted file mode 100644 index 24537a2b3..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json deleted file mode 100644 index 5adb609d1..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.lime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_side.json index 259fd772c..480bff830 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/lime_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.lime" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json deleted file mode 100644 index e18ae2ba9..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json deleted file mode 100644 index a135ece4d..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json deleted file mode 100644 index d0a1ec8e4..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json deleted file mode 100644 index ee2b032e0..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.mahoe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_side.json index f84d9f9db..09395f1ea 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahoe_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.mahoe" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json deleted file mode 100644 index 6ebf4084a..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json deleted file mode 100644 index 5b3c93911..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json deleted file mode 100644 index 2b43a6264..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json deleted file mode 100644 index 9bda1d842..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.mahogany" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_side.json index 9fe2620c6..bf3c3b4bc 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/mahogany_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.mahogany" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json deleted file mode 100644 index 7ac7e80b0..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json deleted file mode 100644 index 65f36de52..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json deleted file mode 100644 index e4e7ca2b8..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json deleted file mode 100644 index 0f48ad7d8..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.maple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_side.json index 01cb5ed58..53991db18 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/maple_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.maple" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json deleted file mode 100644 index f3abc3c3d..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json deleted file mode 100644 index a575f9f29..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json deleted file mode 100644 index 077e8eeb4..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json deleted file mode 100644 index 053d99930..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.padauk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_side.json index b0b09fe64..327a3191d 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/padauk_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.padauk" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json deleted file mode 100644 index 4479a1639..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json deleted file mode 100644 index 0e15a9864..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json deleted file mode 100644 index 88a08810d..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json deleted file mode 100644 index d49fb8bca..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.palm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_side.json index 679caeccd..eb3a5bdb7 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/palm_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.palm" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json deleted file mode 100644 index 4bc9e9e0b..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json deleted file mode 100644 index a46525544..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json deleted file mode 100644 index 2bf825f77..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json deleted file mode 100644 index 5d5c20d2e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.papaya" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_side.json index 38125267b..33dcd5b04 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/papaya_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.papaya" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json deleted file mode 100644 index dbc05bf56..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json deleted file mode 100644 index 8b1513d97..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json deleted file mode 100644 index 5c2d860ad..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json deleted file mode 100644 index 371932d7e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.pine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_side.json index 7bc8ff61a..c0f805490 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/pine_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.pine" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json deleted file mode 100644 index 804fb9549..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json deleted file mode 100644 index 66ec0427e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json deleted file mode 100644 index 820925117..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json deleted file mode 100644 index bfa8ad77d..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.plum" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_side.json index 034dfe485..da22f4781 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/plum_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.plum" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json deleted file mode 100644 index 613cd3676..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json deleted file mode 100644 index 1016dfa0a..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json deleted file mode 100644 index be2bbbb4c..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json deleted file mode 100644 index 2eefa2861..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.poplar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_side.json index 68fa6ae5d..b1ab70405 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/poplar_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.poplar" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json deleted file mode 100644 index 2386ee27b..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json deleted file mode 100644 index d4b33f402..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json deleted file mode 100644 index 05d4d8044..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json deleted file mode 100644 index 5e866c1ff..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.sequoia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_side.json index f97028f3a..b9be0f024 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/sequoia_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.sequoia" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json deleted file mode 100644 index 068e07944..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json deleted file mode 100644 index c9ddb6147..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json deleted file mode 100644 index 264a0c3ad..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json deleted file mode 100644 index 41304038d..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.teak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_side.json index dd28d6e93..89f5a5d55 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/teak_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.teak" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json deleted file mode 100644 index e16d5b053..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json deleted file mode 100644 index c4092a41b..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json deleted file mode 100644 index 124e0327b..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json deleted file mode 100644 index 85a2f51c9..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.walnut" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_side.json index 626d212dd..bb26955cc 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/walnut_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.walnut" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json deleted file mode 100644 index d8176eb8c..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json deleted file mode 100644 index 1a06763eb..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json deleted file mode 100644 index 050b9f902..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json deleted file mode 100644 index 779c09272..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.wenge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_side.json similarity index 69% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_side.json index c678be2b0..03fc90144 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/wenge_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.wenge" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json deleted file mode 100644 index f3642b092..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json deleted file mode 100644 index a0a0710d3..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json deleted file mode 100644 index b64d9a60e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json deleted file mode 100644 index fe06d7af9..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.willow" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_side.json index 4474f54d5..46d201ae4 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/willow_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.willow" } diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json deleted file mode 100644 index 83d2cd122..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json deleted file mode 100644 index 91d21a4ab..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json deleted file mode 100644 index 0ff7be79e..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json deleted file mode 100644 index d850ce181..000000000 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "forestry:blocks/wood/planks.zebrawood" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_side.json similarity index 70% rename from src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json rename to src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_side.json index 27ff56cf7..8716be61c 100644 --- a/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_n.json +++ b/src/main/resources/assets/forestry/models/block/arboriculture/fences/zebrawood_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "forestry:blocks/wood/planks.zebrawood" } diff --git a/src/main/resources/assets/forestry/models/item/fences/acacia.json b/src/main/resources/assets/forestry/models/item/fences/acacia.json index 8397ba429..bc882e78d 100644 --- a/src/main/resources/assets/forestry/models/item/fences/acacia.json +++ b/src/main/resources/assets/forestry/models/item/fences/acacia.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/acacia_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/acacia_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/balsa.json b/src/main/resources/assets/forestry/models/item/fences/balsa.json index 4b099fadf..f487f0e7c 100644 --- a/src/main/resources/assets/forestry/models/item/fences/balsa.json +++ b/src/main/resources/assets/forestry/models/item/fences/balsa.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/balsa_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/balsa_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/baobab.json b/src/main/resources/assets/forestry/models/item/fences/baobab.json index 9055a0181..1f7db7108 100644 --- a/src/main/resources/assets/forestry/models/item/fences/baobab.json +++ b/src/main/resources/assets/forestry/models/item/fences/baobab.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/baobab_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/baobab_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/cherry.json b/src/main/resources/assets/forestry/models/item/fences/cherry.json index e0bcbb29f..635e4564a 100644 --- a/src/main/resources/assets/forestry/models/item/fences/cherry.json +++ b/src/main/resources/assets/forestry/models/item/fences/cherry.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/cherry_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/cherry_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/chestnut.json b/src/main/resources/assets/forestry/models/item/fences/chestnut.json index 0c932d1c1..06baa0eff 100644 --- a/src/main/resources/assets/forestry/models/item/fences/chestnut.json +++ b/src/main/resources/assets/forestry/models/item/fences/chestnut.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/chestnut_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/chestnut_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/citrus.json b/src/main/resources/assets/forestry/models/item/fences/citrus.json index 17ba1e565..c084976f4 100644 --- a/src/main/resources/assets/forestry/models/item/fences/citrus.json +++ b/src/main/resources/assets/forestry/models/item/fences/citrus.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/citrus_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/citrus_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/cocobolo.json b/src/main/resources/assets/forestry/models/item/fences/cocobolo.json index 3c280bf71..e0209eb57 100644 --- a/src/main/resources/assets/forestry/models/item/fences/cocobolo.json +++ b/src/main/resources/assets/forestry/models/item/fences/cocobolo.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/cocobolo_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/cocobolo_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/ebony.json b/src/main/resources/assets/forestry/models/item/fences/ebony.json index c28c28c08..6c49f7705 100644 --- a/src/main/resources/assets/forestry/models/item/fences/ebony.json +++ b/src/main/resources/assets/forestry/models/item/fences/ebony.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/ebony_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/ebony_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/giganteum.json b/src/main/resources/assets/forestry/models/item/fences/giganteum.json index 2c223e3e1..35850c92d 100644 --- a/src/main/resources/assets/forestry/models/item/fences/giganteum.json +++ b/src/main/resources/assets/forestry/models/item/fences/giganteum.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/giganteum_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/giganteum_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/greenheart.json b/src/main/resources/assets/forestry/models/item/fences/greenheart.json index 0a15ad730..f263098e0 100644 --- a/src/main/resources/assets/forestry/models/item/fences/greenheart.json +++ b/src/main/resources/assets/forestry/models/item/fences/greenheart.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/greenheart_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/greenheart_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/ipe.json b/src/main/resources/assets/forestry/models/item/fences/ipe.json index 0a31d875e..71f754d7c 100644 --- a/src/main/resources/assets/forestry/models/item/fences/ipe.json +++ b/src/main/resources/assets/forestry/models/item/fences/ipe.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/ipe_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/ipe_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/kapok.json b/src/main/resources/assets/forestry/models/item/fences/kapok.json index 1f1b27147..e24e8bdc1 100644 --- a/src/main/resources/assets/forestry/models/item/fences/kapok.json +++ b/src/main/resources/assets/forestry/models/item/fences/kapok.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/kapok_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/kapok_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/larch.json b/src/main/resources/assets/forestry/models/item/fences/larch.json index b2485108e..e221086f0 100644 --- a/src/main/resources/assets/forestry/models/item/fences/larch.json +++ b/src/main/resources/assets/forestry/models/item/fences/larch.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/larch_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/larch_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/lime.json b/src/main/resources/assets/forestry/models/item/fences/lime.json index c6d7f5d58..de9127e3c 100644 --- a/src/main/resources/assets/forestry/models/item/fences/lime.json +++ b/src/main/resources/assets/forestry/models/item/fences/lime.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/lime_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/lime_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/mahoe.json b/src/main/resources/assets/forestry/models/item/fences/mahoe.json index 1f6dac329..e4c93a221 100644 --- a/src/main/resources/assets/forestry/models/item/fences/mahoe.json +++ b/src/main/resources/assets/forestry/models/item/fences/mahoe.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/mahoe_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/mahoe_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/mahogany.json b/src/main/resources/assets/forestry/models/item/fences/mahogany.json index 103faa696..6a613c962 100644 --- a/src/main/resources/assets/forestry/models/item/fences/mahogany.json +++ b/src/main/resources/assets/forestry/models/item/fences/mahogany.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/mahogany_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/mahogany_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/maple.json b/src/main/resources/assets/forestry/models/item/fences/maple.json index b77f59c17..51c634fb4 100644 --- a/src/main/resources/assets/forestry/models/item/fences/maple.json +++ b/src/main/resources/assets/forestry/models/item/fences/maple.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/maple_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/maple_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/padauk.json b/src/main/resources/assets/forestry/models/item/fences/padauk.json index ee48eef5a..6c1a3347d 100644 --- a/src/main/resources/assets/forestry/models/item/fences/padauk.json +++ b/src/main/resources/assets/forestry/models/item/fences/padauk.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/padauk_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/padauk_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/palm.json b/src/main/resources/assets/forestry/models/item/fences/palm.json index f48ed0cb2..dc4293671 100644 --- a/src/main/resources/assets/forestry/models/item/fences/palm.json +++ b/src/main/resources/assets/forestry/models/item/fences/palm.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/palm_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/palm_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/papaya.json b/src/main/resources/assets/forestry/models/item/fences/papaya.json index 10a9be323..f85d5ce82 100644 --- a/src/main/resources/assets/forestry/models/item/fences/papaya.json +++ b/src/main/resources/assets/forestry/models/item/fences/papaya.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/papaya_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/papaya_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/pine.json b/src/main/resources/assets/forestry/models/item/fences/pine.json index 47cc1aa4d..9cefec7cf 100644 --- a/src/main/resources/assets/forestry/models/item/fences/pine.json +++ b/src/main/resources/assets/forestry/models/item/fences/pine.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/pine_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/pine_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/plum.json b/src/main/resources/assets/forestry/models/item/fences/plum.json index 6e906dd0e..856101ae9 100644 --- a/src/main/resources/assets/forestry/models/item/fences/plum.json +++ b/src/main/resources/assets/forestry/models/item/fences/plum.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/plum_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/plum_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/poplar.json b/src/main/resources/assets/forestry/models/item/fences/poplar.json index a9217d6cc..dd6ec4153 100644 --- a/src/main/resources/assets/forestry/models/item/fences/poplar.json +++ b/src/main/resources/assets/forestry/models/item/fences/poplar.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/poplar_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/poplar_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/sequoia.json b/src/main/resources/assets/forestry/models/item/fences/sequoia.json index 54f94293c..e0841a922 100644 --- a/src/main/resources/assets/forestry/models/item/fences/sequoia.json +++ b/src/main/resources/assets/forestry/models/item/fences/sequoia.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/sequoia_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/sequoia_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/teak.json b/src/main/resources/assets/forestry/models/item/fences/teak.json index cdb5b7b28..8457a8f0b 100644 --- a/src/main/resources/assets/forestry/models/item/fences/teak.json +++ b/src/main/resources/assets/forestry/models/item/fences/teak.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/teak_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/teak_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/walnut.json b/src/main/resources/assets/forestry/models/item/fences/walnut.json index 78383579c..8a4f2d82a 100644 --- a/src/main/resources/assets/forestry/models/item/fences/walnut.json +++ b/src/main/resources/assets/forestry/models/item/fences/walnut.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/walnut_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/walnut_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/wenge.json b/src/main/resources/assets/forestry/models/item/fences/wenge.json index dac0373d3..020e993b6 100644 --- a/src/main/resources/assets/forestry/models/item/fences/wenge.json +++ b/src/main/resources/assets/forestry/models/item/fences/wenge.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/wenge_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/wenge_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/willow.json b/src/main/resources/assets/forestry/models/item/fences/willow.json index d85c6796c..78842dab9 100644 --- a/src/main/resources/assets/forestry/models/item/fences/willow.json +++ b/src/main/resources/assets/forestry/models/item/fences/willow.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/willow_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/willow_inventory" } diff --git a/src/main/resources/assets/forestry/models/item/fences/zebrawood.json b/src/main/resources/assets/forestry/models/item/fences/zebrawood.json index 316bd70f6..3c9702384 100644 --- a/src/main/resources/assets/forestry/models/item/fences/zebrawood.json +++ b/src/main/resources/assets/forestry/models/item/fences/zebrawood.json @@ -1,13 +1,3 @@ { - "parent": "forestry:block/arboriculture/fences/zebrawood_inventory", - "display": { - "thirdperson": { - "rotation": [ 0, 0, 180 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "gui": { - "rotation": [ 0, 90, 0 ] - } - } + "parent": "forestry:block/arboriculture/fences/zebrawood_inventory" }