diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sacred_oak_fence.json b/src/main/resources/assets/biomesoplenty/blockstates/sacred_oak_fence.json index f96c5e7d6..37c81f252 100644 --- a/src/main/resources/assets/biomesoplenty/blockstates/sacred_oak_fence.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/sacred_oak_fence.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "biomesoplenty:sacred_oak_fence_post" }, - "east=false,north=true,south=false,west=false": { "model": "biomesoplenty:sacred_oak_fence_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "biomesoplenty:sacred_oak_fence_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "biomesoplenty:sacred_oak_fence_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "biomesoplenty:sacred_oak_fence_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "biomesoplenty:sacred_oak_fence_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "biomesoplenty:sacred_oak_fence_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "biomesoplenty:sacred_oak_fence_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "biomesoplenty:sacred_oak_fence_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "biomesoplenty:sacred_oak_fence_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "biomesoplenty:sacred_oak_fence_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "biomesoplenty:sacred_oak_fence_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "biomesoplenty:sacred_oak_fence_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "biomesoplenty:sacred_oak_fence_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "biomesoplenty:sacred_oak_fence_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "biomesoplenty:sacred_oak_fence_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "biomesoplenty:sacred_oak_fence_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "biomesoplenty:sacred_oak_fence_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "biomesoplenty:sacred_oak_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "biomesoplenty:sacred_oak_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "biomesoplenty:sacred_oak_fence_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_ne.json b/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_ne.json deleted file mode 100644 index 4e61c2b78..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "biomesoplenty:blocks/sacred_oak_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_ns.json b/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_ns.json deleted file mode 100644 index 9a4d66f51..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "biomesoplenty:blocks/sacred_oak_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_nse.json b/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_nse.json deleted file mode 100644 index e9a5d39b2..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "biomesoplenty:blocks/sacred_oak_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_nsew.json b/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_nsew.json deleted file mode 100644 index 2f1d6ec98..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "biomesoplenty:blocks/sacred_oak_planks" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_n.json b/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_side.json similarity index 72% rename from src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_n.json rename to src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_side.json index 15c2c8fdf..b5190b034 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_n.json +++ b/src/main/resources/assets/biomesoplenty/models/block/sacred_oak_fence_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "biomesoplenty:blocks/sacred_oak_planks" }