diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json index 9250e596c..87e51eb6d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0Wall.json @@ -1,47 +1,28 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block" }, "variants": { - "east=false,north=true,south=true,up=false,bswall_variant=forest_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=plains_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=mountain_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=fungal_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=swamp_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=desert_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=taiga_cobble,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,bswall_variant=mesa_cobble,west=false": { "model": null }, - - "east=true,north=false,south=false,up=false,bswall_variant=forest_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=plains_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=mountain_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=fungal_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=swamp_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=desert_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=taiga_cobble,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,bswall_variant=mesa_cobble,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "bswall_variant": { @@ -56,35 +37,35 @@ }, "inventory_forest_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone8" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_plains_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone9" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_mountain_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone10" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_fungal_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone11" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_swamp_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone12" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_desert_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone13" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_taiga_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone14" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_mesa_cobble": [{ "textures": { "wall": "botania:blocks/biomeStone15" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json index 31863d217..d5c3c9bad 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/dreamwood0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json index 6da2b10a5..c4cf2c3e0 100644 --- a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingrock0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/livingrock0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json index a7dc154f6..c6f6b57b1 100644 --- a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json +++ b/src/main/resources/assets/botania/blockstates/livingwood0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/livingwood0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json index 05ddceaee..544b635d1 100644 --- a/src/main/resources/assets/botania/blockstates/prismarine0Wall.json +++ b/src/main/resources/assets/botania/blockstates/prismarine0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block", "textures": { "wall": "botania:blocks/prismarine0" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json index c6c6dfa19..11f39c16a 100644 --- a/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json +++ b/src/main/resources/assets/botania/blockstates/reedBlock0Wall.json @@ -1,37 +1,33 @@ { "forge_marker": 1, "defaults": { - "model": "botania:wall_post_bottom_top", "uvlock": true, "transform": "forge:default-block", "textures": { "side": "botania:blocks/reedBlock0", "top": "botania:blocks/reedBlock1", "bottom": "botania:blocks/reedBlock1" } }, "variants": { - "east=false,north=true,south=true,up=false,west=false": { "model": null }, - "east=true,north=false,south=false,up=false,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect_bottom_top" }, + "true": { "submodel": "botania:wall_side_bottom_top" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect_bottom_top", "y": 180 }, + "true": { "submodel": "botania:wall_side_bottom_top", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect_bottom_top", "y": 270 }, + "true": { "submodel": "botania:wall_side_bottom_top", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect_bottom_top", "y": 90 }, + "true": { "submodel": "botania:wall_side_bottom_top", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "botania:wall_post_bottom_top" }, "false": {} }, "inventory": [{ - "submodel": { "north": { "model": "botania:wall_connect_bottom_top" }, "south": { "model": "botania:wall_connect_bottom_top", "y": 180 }} + "model": "botania:wall_inventory_bottom_top" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/stone0Wall.json b/src/main/resources/assets/botania/blockstates/stone0Wall.json index 19456ecf3..29e8e8174 100644 --- a/src/main/resources/assets/botania/blockstates/stone0Wall.json +++ b/src/main/resources/assets/botania/blockstates/stone0Wall.json @@ -1,39 +1,28 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:wall_post", "uvlock": true, "transform": "forge:default-block" }, "variants": { - "east=false,north=true,south=true,up=false,fswall_variant=andesite,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,fswall_variant=basalt,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,fswall_variant=diorite,west=false": { "model": null }, - "east=false,north=true,south=true,up=false,fswall_variant=granite,west=false": { "model": null }, - - "east=true,north=false,south=false,up=false,fswall_variant=andesite,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,fswall_variant=basalt,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,fswall_variant=diorite,west=true": { "model": null }, - "east=true,north=false,south=false,up=false,fswall_variant=granite,west=true": { "model": null }, - "north": { - "true": { "submodel": "botania:wall_connect" }, + "true": { "submodel": "minecraft:wall_side" }, "false": {} }, "south": { - "true": { "submodel": "botania:wall_connect", "y": 180 }, + "true": { "submodel": "minecraft:wall_side", "y": 180 }, "false": {} }, "west": { - "true": { "submodel": "botania:wall_connect", "y": 270 }, + "true": { "submodel": "minecraft:wall_side", "y": 270 }, "false": {} }, "east": { - "true": { "submodel": "botania:wall_connect", "y": 90 }, + "true": { "submodel": "minecraft:wall_side", "y": 90 }, "false": {} }, "up": { - "true": {}, + "true": { "submodel": "minecraft:wall_post" }, "false": {} }, "fswall_variant": { @@ -44,19 +33,19 @@ }, "inventory_andesite": [{ "textures": { "wall": "botania:blocks/stone0" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_basalt": [{ "textures": { "wall": "botania:blocks/stone1" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_diorite": [{ "textures": { "wall": "botania:blocks/stone2" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }], "inventory_granite": [{ "textures": { "wall": "botania:blocks/stone3" }, - "submodel": { "north": { "model": "botania:wall_connect" }, "south": { "model": "botania:wall_connect", "y": 180 }} + "model": "minecraft:wall_inventory" }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/wall_connect.json b/src/main/resources/assets/botania/models/block/wall_connect.json deleted file mode 100644 index 281d9a7b5..000000000 --- a/src/main/resources/assets/botania/models/block/wall_connect.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "__comment": "Stolen from the Forge example/debug code", - "textures": { - "particle": "#wall" - }, - "elements": [ - { "from": [ 5, 0, 0 ], - "to": [ 11, 13, 8 ], - "faces": { - "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall", "cullface": "down" }, - "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#wall" }, - "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#wall", "cullface": "north" }, - "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" }, - "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#wall" } - }, - "__comment": "North wall" - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json deleted file mode 100644 index 3252c7e70..000000000 --- a/src/main/resources/assets/botania/models/block/wall_connect_bottom_top.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "__comment": "Stolen from the Forge example/debug code", - "textures": { - "particle": "#side" - }, - "elements": [ - { - "from": [ 5, 0, 0 ], - "to": [ 11, 13, 8 ], - "faces": { - "down": { "uv": [ 5, 0, 11, 8 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 5, 0, 11, 8 ], "texture": "#top" }, - "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, - "west": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" }, - "east": { "uv": [ 0, 3, 8, 16 ], "texture": "#side" } - }, - "__comment": "North wall" - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json new file mode 100644 index 000000000..f22935748 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json @@ -0,0 +1,46 @@ +{ + "__comment": "Copy of minecraft:wall_inventory with separate bottom and top textures", + "parent": "block/block", + "display": { + "gui": { + "rotation": [ 30, 135, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "fixed": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + }, + "ambientocclusion": false, + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + } + }, + { + "from": [ 5, 0, 0 ], + "to": [ 11, 13, 16 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 5, 0, 11, 16 ], "texture": "#top" }, + "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 3, 16, 16 ], "texture": "#side" }, + "east": { "uv": [ 0, 3, 16, 16 ], "texture": "#side" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json index c060e1ff3..c90838654 100644 --- a/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json +++ b/src/main/resources/assets/botania/models/block/wall_post_bottom_top.json @@ -1,19 +1,20 @@ { + "__comment": "Copy of minecraft:wall_post with separate top and bottom textures", "textures": { "particle": "#side" }, "elements": [ - { "from": [ 4, 0, 4 ], + { + "from": [ 4, 0, 4 ], "to": [ 12, 16, 12 ], "faces": { - "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, - "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, - "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } - }, - "__comment": "Center post" + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#top", "cullface": "up" }, + "north": { "texture": "#side" }, + "south": { "texture": "#side" }, + "west": { "texture": "#side" }, + "east": { "texture": "#side" } + } } ] } diff --git a/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json b/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json new file mode 100644 index 000000000..80594c7c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/wall_side_bottom_top.json @@ -0,0 +1,19 @@ +{ + "__comment": "Copy of minecraft:wall_side with separate top and bottom textures", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 14, 8 ], + "faces": { + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#top" }, + "north": { "texture": "#side", "cullface": "north" }, + "west": { "texture": "#side" }, + "east": { "texture": "#side" } + } + } + ] +}