diff --git a/src/main/resources/assets/techreborn/blockstates/ironFence.json b/src/main/resources/assets/techreborn/blockstates/ironFence.json index 0f80e6ed6..76b6107ba 100644 --- a/src/main/resources/assets/techreborn/blockstates/ironFence.json +++ b/src/main/resources/assets/techreborn/blockstates/ironFence.json @@ -1,20 +1,17 @@ { - "variants": { - "east=false,north=false,south=false,west=false": { "model": "techreborn:iron_fence_post" }, - "east=false,north=true,south=false,west=false": { "model": "techreborn:iron_fence_n", "uvlock": true }, - "east=true,north=false,south=false,west=false": { "model": "techreborn:iron_fence_n", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=false": { "model": "techreborn:iron_fence_n", "y": 180, "uvlock": true }, - "east=false,north=false,south=false,west=true": { "model": "techreborn:iron_fence_n", "y": 270, "uvlock": true }, - "east=true,north=true,south=false,west=false": { "model": "techreborn:iron_fence_ne", "uvlock": true }, - "east=true,north=false,south=true,west=false": { "model": "techreborn:iron_fence_ne", "y": 90, "uvlock": true }, - "east=false,north=false,south=true,west=true": { "model": "techreborn:iron_fence_ne", "y": 180, "uvlock": true }, - "east=false,north=true,south=false,west=true": { "model": "techreborn:iron_fence_ne", "y": 270, "uvlock": true }, - "east=false,north=true,south=true,west=false": { "model": "techreborn:iron_fence_ns", "uvlock": true }, - "east=true,north=false,south=false,west=true": { "model": "techreborn:iron_fence_ns", "y": 90, "uvlock": true }, - "east=true,north=true,south=true,west=false": { "model": "techreborn:iron_fence_nse", "uvlock": true }, - "east=true,north=false,south=true,west=true": { "model": "techreborn:iron_fence_nse", "y": 90, "uvlock": true }, - "east=false,north=true,south=true,west=true": { "model": "techreborn:iron_fence_nse", "y": 180, "uvlock": true }, - "east=true,north=true,south=false,west=true": { "model": "techreborn:iron_fence_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "techreborn:iron_fence_nsew", "uvlock": true } - } + "multipart": [ + { "apply": { "model": "techreborn:iron_fence_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "techreborn:iron_fence_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "techreborn:iron_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "techreborn:iron_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "techreborn:iron_fence_side", "y": 270, "uvlock": true } + } + ] } diff --git a/src/main/resources/assets/techreborn/models/block/iron_fence_ne.json b/src/main/resources/assets/techreborn/models/block/iron_fence_ne.json deleted file mode 100644 index dffb3d1a5..000000000 --- a/src/main/resources/assets/techreborn/models/block/iron_fence_ne.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ne", - "textures": { - "texture": "blocks/iron_block" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/iron_fence_ns.json b/src/main/resources/assets/techreborn/models/block/iron_fence_ns.json deleted file mode 100644 index 4b14062f1..000000000 --- a/src/main/resources/assets/techreborn/models/block/iron_fence_ns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_ns", - "textures": { - "texture": "blocks/iron_block" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/iron_fence_nse.json b/src/main/resources/assets/techreborn/models/block/iron_fence_nse.json deleted file mode 100644 index 1635db7e4..000000000 --- a/src/main/resources/assets/techreborn/models/block/iron_fence_nse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nse", - "textures": { - "texture": "blocks/iron_block" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/iron_fence_nsew.json b/src/main/resources/assets/techreborn/models/block/iron_fence_nsew.json deleted file mode 100644 index 990287a46..000000000 --- a/src/main/resources/assets/techreborn/models/block/iron_fence_nsew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/fence_nsew", - "textures": { - "texture": "blocks/iron_block" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/iron_fence_n.json b/src/main/resources/assets/techreborn/models/block/iron_fence_side.json similarity index 66% rename from src/main/resources/assets/techreborn/models/block/iron_fence_n.json rename to src/main/resources/assets/techreborn/models/block/iron_fence_side.json index 6c27ebe16..4bd60bb23 100644 --- a/src/main/resources/assets/techreborn/models/block/iron_fence_n.json +++ b/src/main/resources/assets/techreborn/models/block/iron_fence_side.json @@ -1,5 +1,5 @@ { - "parent": "block/fence_n", + "parent": "block/fence_side", "textures": { "texture": "blocks/iron_block" } diff --git a/src/main/resources/assets/techreborn/models/item/ironFence.json b/src/main/resources/assets/techreborn/models/item/ironFence.json index 43837aad0..d6092b3b3 100644 --- a/src/main/resources/assets/techreborn/models/item/ironFence.json +++ b/src/main/resources/assets/techreborn/models/item/ironFence.json @@ -1,13 +1,3 @@ { - "parent": "techreborn:block/iron_fence_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": "techreborn:block/iron_fence_inventory" } diff --git a/src/main/resources/assets/techreborn/models/item/ironFenceGate.json b/src/main/resources/assets/techreborn/models/item/ironFenceGate.json deleted file mode 100644 index 9ca5f7378..000000000 --- a/src/main/resources/assets/techreborn/models/item/ironFenceGate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "techreborn:block/iron_fence_gate_closed", - "display": { - "thirdperson": { - "rotation": [ 0, -90, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - } - } -}