From 70942d708992e82a0221ec1f0eb53a4e0f1a8f2b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Feb 2016 21:49:54 -0600 Subject: [PATCH] Fix faulty pane culling (vanilla bug) --- .../botania/blockstates/bifrostPermPane.json | 4 ++-- .../botania/blockstates/elfGlassPane.json | 4 ++-- .../botania/blockstates/manaGlassPane.json | 4 ++-- .../botania/models/block/pane_ns_fixed.json | 21 +++++++++++++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/pane_ns_fixed.json diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json index 14b6a2719..5d35ff02d 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json +++ b/src/main/resources/assets/botania/blockstates/bifrostPermPane.json @@ -16,8 +16,8 @@ "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, - "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, + "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfGlassPane.json index 4877ed756..8ef285391 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfGlassPane.json @@ -16,8 +16,8 @@ "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, - "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, + "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/manaGlassPane.json index 27be01075..8a3af453d 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/manaGlassPane.json @@ -16,8 +16,8 @@ "east=true,north=false,south=true,west=false": { "model": "minecraft:pane_ne", "y": 90 }, "east=false,north=false,south=true,west=true": { "model": "minecraft:pane_ne", "y": 180 }, "east=false,north=true,south=false,west=true": { "model": "minecraft:pane_ne", "y": 270 }, - "east=false,north=true,south=true,west=false": { "model": "minecraft:pane_ns" }, - "east=true,north=false,south=false,west=true": { "model": "minecraft:pane_ns", "y": 90 }, + "east=false,north=true,south=true,west=false": { "model": "botania:pane_ns_fixed" }, + "east=true,north=false,south=false,west=true": { "model": "botania:pane_ns_fixed", "y": 90 }, "east=true,north=true,south=true,west=false": { "model": "minecraft:pane_nse" }, "east=true,north=false,south=true,west=true": { "model": "minecraft:pane_nse", "y": 90 }, "east=false,north=true,south=true,west=true": { "model": "minecraft:pane_nse", "y": 180 }, diff --git a/src/main/resources/assets/botania/models/block/pane_ns_fixed.json b/src/main/resources/assets/botania/models/block/pane_ns_fixed.json new file mode 100644 index 000000000..b9fd7289f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pane_ns_fixed.json @@ -0,0 +1,21 @@ +{ + "__coment": "Copy of vanilla pane_ns, fixing the incorrect cullfaces there. Remove in 1.9", + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 16 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge" }, + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#pane" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#pane" } + } + } + ] +}