From 9c20dccaf22ba730a6726fbb9a46f91b89736aa4 Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 29 Jun 2020 17:46:51 +0200 Subject: [PATCH] Fix wall models and duplicate loader registration on resource reload --- .../botania/blockstates/dreamwood_wall.json | 51 ++++++++++++++++--- .../botania/blockstates/livingrock_wall.json | 51 ++++++++++++++++--- .../botania/blockstates/livingwood_wall.json | 51 ++++++++++++++++--- .../metamorphic_desert_cobblestone_wall.json | 51 ++++++++++++++++--- .../metamorphic_forest_cobblestone_wall.json | 51 ++++++++++++++++--- .../metamorphic_fungal_cobblestone_wall.json | 51 ++++++++++++++++--- .../metamorphic_mesa_cobblestone_wall.json | 51 ++++++++++++++++--- ...metamorphic_mountain_cobblestone_wall.json | 51 ++++++++++++++++--- .../metamorphic_plains_cobblestone_wall.json | 51 ++++++++++++++++--- .../metamorphic_swamp_cobblestone_wall.json | 51 ++++++++++++++++--- .../metamorphic_taiga_cobblestone_wall.json | 51 ++++++++++++++++--- .../client/core/handler/ModelHandler.java | 7 +-- .../botania/data/BlockstateProvider.java | 27 +++++++++- .../vazkii/botania/data/DataGenerators.java | 9 ++-- .../block/dreamwood_wall_side_tall.json | 6 +++ .../block/livingrock_wall_side_tall.json | 6 +++ .../block/livingwood_wall_side_tall.json | 6 +++ ...hic_desert_cobblestone_wall_side_tall.json | 6 +++ ...hic_forest_cobblestone_wall_side_tall.json | 6 +++ ...hic_fungal_cobblestone_wall_side_tall.json | 6 +++ ...rphic_mesa_cobblestone_wall_side_tall.json | 6 +++ ...c_mountain_cobblestone_wall_side_tall.json | 6 +++ ...hic_plains_cobblestone_wall_side_tall.json | 6 +++ ...phic_swamp_cobblestone_wall_side_tall.json | 6 +++ ...phic_taiga_cobblestone_wall_side_tall.json | 6 +++ 25 files changed, 597 insertions(+), 73 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/livingrock_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_desert_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_forest_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_fungal_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_mesa_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_mountain_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_plains_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_swamp_cobblestone_wall_side_tall.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic_taiga_cobblestone_wall_side_tall.json diff --git a/src/generated/resources/assets/botania/blockstates/dreamwood_wall.json b/src/generated/resources/assets/botania/blockstates/dreamwood_wall.json index 10945cc47..3178f1386 100644 --- a/src/generated/resources/assets/botania/blockstates/dreamwood_wall.json +++ b/src/generated/resources/assets/botania/blockstates/dreamwood_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/dreamwood_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/dreamwood_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/dreamwood_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/dreamwood_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/dreamwood_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/dreamwood_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/dreamwood_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/dreamwood_wall_side", - "y": 90, + "model": "botania:block/dreamwood_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/livingrock_wall.json b/src/generated/resources/assets/botania/blockstates/livingrock_wall.json index fe31bb1eb..cfb43d8a7 100644 --- a/src/generated/resources/assets/botania/blockstates/livingrock_wall.json +++ b/src/generated/resources/assets/botania/blockstates/livingrock_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/livingrock_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/livingrock_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/livingrock_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/livingrock_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/livingrock_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/livingrock_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/livingrock_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/livingrock_wall_side", - "y": 90, + "model": "botania:block/livingrock_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/livingwood_wall.json b/src/generated/resources/assets/botania/blockstates/livingwood_wall.json index 12229aa16..aae6c8550 100644 --- a/src/generated/resources/assets/botania/blockstates/livingwood_wall.json +++ b/src/generated/resources/assets/botania/blockstates/livingwood_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/livingwood_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/livingwood_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/livingwood_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/livingwood_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/livingwood_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/livingwood_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/livingwood_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/livingwood_wall_side", - "y": 90, + "model": "botania:block/livingwood_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_desert_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_desert_cobblestone_wall.json index f0d69415f..d21984726 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_desert_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_desert_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_desert_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_desert_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_desert_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_desert_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_desert_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_desert_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_desert_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_desert_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_desert_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_forest_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_forest_cobblestone_wall.json index e5838c54d..a8b6cb8c9 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_forest_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_forest_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_forest_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_forest_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_forest_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_forest_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_forest_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_forest_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_forest_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_forest_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_forest_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_fungal_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_fungal_cobblestone_wall.json index 087076190..9cc7ffcb1 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_fungal_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_fungal_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_fungal_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_fungal_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_fungal_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_fungal_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_fungal_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_fungal_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_fungal_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_fungal_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_fungal_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_mesa_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_mesa_cobblestone_wall.json index 1b267268f..9447d9c33 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_mesa_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_mesa_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_mesa_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_mesa_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_mesa_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_mesa_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_mesa_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_mesa_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_mesa_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_mesa_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_mesa_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_mountain_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_mountain_cobblestone_wall.json index baaa3aa1b..94447d06e 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_mountain_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_mountain_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_mountain_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_mountain_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_mountain_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_mountain_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_mountain_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_mountain_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_mountain_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_mountain_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_mountain_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_plains_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_plains_cobblestone_wall.json index 020f7711c..41730eb32 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_plains_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_plains_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_plains_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_plains_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_plains_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_plains_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_plains_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_plains_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_plains_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_plains_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_plains_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_swamp_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_swamp_cobblestone_wall.json index 33646e5a1..88afcea2b 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_swamp_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_swamp_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_swamp_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_swamp_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_swamp_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_swamp_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_swamp_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_swamp_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_swamp_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_swamp_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_swamp_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated/resources/assets/botania/blockstates/metamorphic_taiga_cobblestone_wall.json b/src/generated/resources/assets/botania/blockstates/metamorphic_taiga_cobblestone_wall.json index 0aadb3b98..535b99b7d 100644 --- a/src/generated/resources/assets/botania/blockstates/metamorphic_taiga_cobblestone_wall.json +++ b/src/generated/resources/assets/botania/blockstates/metamorphic_taiga_cobblestone_wall.json @@ -10,7 +10,7 @@ }, { "when": { - "north": "true" + "north": "low" }, "apply": { "model": "botania:block/metamorphic_taiga_cobblestone_wall_side", @@ -19,7 +19,36 @@ }, { "when": { - "south": "true" + "north": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_taiga_cobblestone_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "botania:block/metamorphic_taiga_cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_taiga_cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" }, "apply": { "model": "botania:block/metamorphic_taiga_cobblestone_wall_side", @@ -29,7 +58,17 @@ }, { "when": { - "west": "true" + "south": "tall" + }, + "apply": { + "model": "botania:block/metamorphic_taiga_cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" }, "apply": { "model": "botania:block/metamorphic_taiga_cobblestone_wall_side", @@ -39,11 +78,11 @@ }, { "when": { - "east": "true" + "west": "tall" }, "apply": { - "model": "botania:block/metamorphic_taiga_cobblestone_wall_side", - "y": 90, + "model": "botania:block/metamorphic_taiga_cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 142ec4cd5..888022de5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -37,9 +37,10 @@ public final class ModelHandler { static boolean registeredModels = false; public static void registerModels(ModelRegistryEvent evt) { - registeredModels = true; - - ModelLoaderRegistry.registerLoader(FloatingFlowerModel.Loader.ID, FloatingFlowerModel.Loader.INSTANCE); + if (!registeredModels) { + registeredModels = true; + ModelLoaderRegistry.registerLoader(FloatingFlowerModel.Loader.ID, FloatingFlowerModel.Loader.INSTANCE); + } ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":mana_gun_clip", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory")); diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index fc110a8c7..f78fddb7e 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -8,8 +8,11 @@ */ package vazkii.botania.data; +import com.google.common.collect.ImmutableMap; + import net.minecraft.block.*; import net.minecraft.data.DataGenerator; +import net.minecraft.state.EnumProperty; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.DoubleBlockHalf; import net.minecraft.state.properties.SlabType; @@ -20,6 +23,7 @@ import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ExistingFileHelper; import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import vazkii.botania.common.block.BlockAltGrass; import vazkii.botania.common.block.ModBlocks; @@ -30,6 +34,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import java.util.Map; import java.util.stream.IntStream; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @@ -76,7 +81,8 @@ public class BlockstateProvider extends BlockStateProvider { } else if (b instanceof WallBlock) { ModelFile post = models().getExistingFile(prefix("block/" + name + "_post")); ModelFile side = models().getExistingFile(prefix("block/" + name + "_side")); - wallBlock((WallBlock) b, post, side); + ModelFile tallSide = models().getExistingFile(prefix("block/" + name + "_side_tall")); + wallBlock((WallBlock) b, post, side, tallSide); } else if (b instanceof FenceBlock) { ModelFile post = models().getExistingFile(prefix("block/" + name + "_post")); ModelFile side = models().getExistingFile(prefix("block/" + name + "_side")); @@ -136,6 +142,25 @@ public class BlockstateProvider extends BlockStateProvider { }); } + private static final Map> DIRECTION_TO_WALL_SIDE = ImmutableMap.>builder() + .put(Direction.NORTH, WallBlock.field_235613_c_) + .put(Direction.EAST, WallBlock.field_235612_b_) + .put(Direction.SOUTH, WallBlock.field_235614_d_) + .put(Direction.WEST, WallBlock.field_235615_e_).build(); + + private void wallBlock(WallBlock block, ModelFile post, ModelFile side, ModelFile tallSide) { + MultiPartBlockStateBuilder builder = getMultipartBuilder(block) + .part().modelFile(post).addModel() + .condition(WallBlock.UP, true).end(); + + DIRECTION_TO_WALL_SIDE.forEach((dir, value) -> { + builder.part().modelFile(side).rotationY((((int) dir.getHorizontalAngle()) + 180) % 360).uvLock(true).addModel() + .condition(value, WallHeight.LOW).end() + .part().modelFile(tallSide).rotationY((((int) dir.getHorizontalAngle()) + 180) % 360).uvLock(true).addModel() + .condition(value, WallHeight.TALL); + }); + } + private void redStringBlock(Block b) { ModelFile file = models().getExistingFile(prefix("block/" + Registry.BLOCK.getKey(b).getPath())); getVariantBuilder(b) diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index f4f490787..591b2b398 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -22,9 +22,6 @@ public class DataGenerators { evt.getGenerator().addProvider(new StonecuttingProvider(evt.getGenerator())); evt.getGenerator().addProvider(new RecipeProvider(evt.getGenerator())); evt.getGenerator().addProvider(new SmeltingProvider(evt.getGenerator())); - evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); - evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); - evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new ElvenTradeProvider(evt.getGenerator())); evt.getGenerator().addProvider(new ManaInfusionProvider(evt.getGenerator())); evt.getGenerator().addProvider(new PureDaisyProvider(evt.getGenerator())); @@ -32,5 +29,11 @@ public class DataGenerators { evt.getGenerator().addProvider(new PetalProvider(evt.getGenerator())); evt.getGenerator().addProvider(new RuneProvider(evt.getGenerator())); } + if (evt.includeClient()) { + evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); + evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); + evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); + } } + } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json b/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json new file mode 100644 index 000000000..2905291ce --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_wall_side_tall.json b/src/main/resources/assets/botania/models/block/livingrock_wall_side_tall.json new file mode 100644 index 000000000..279da720e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingrock_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/livingrock0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json b/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json new file mode 100644 index 000000000..dc198e690 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_desert_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_desert_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..7627a50f1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_desert_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_forest_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_forest_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..8152d73d4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_forest_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_fungal_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_fungal_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..537bb9683 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_fungal_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_mesa_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_mesa_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..f3ca8ece3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_mesa_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_mountain_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_mountain_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..815dca869 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_mountain_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_plains_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_plains_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..65dec16eb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_plains_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_swamp_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_swamp_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..1d7f2fb28 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_swamp_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic_taiga_cobblestone_wall_side_tall.json b/src/main/resources/assets/botania/models/block/metamorphic_taiga_cobblestone_wall_side_tall.json new file mode 100644 index 000000000..759d81d03 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic_taiga_cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "botania:blocks/biomestone14" + } +} \ No newline at end of file