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 77d47b9de..c34ef7de6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -610,7 +610,8 @@ public final class ModelHandler { ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); // Ignore vanilla variant in walls - ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, + (new StateMap.Builder()).withName(BotaniaStateProps.BIOMESTONEWALL_VARIANT).ignore(BlockWall.VARIANT).withSuffix("_wall").build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); @@ -807,8 +808,7 @@ public final class ModelHandler { private static void registerWalls() { Item item = Item.getItemFromBlock(ModFluffBlocks.biomeStoneWall); for (BiomeStoneVariant variant : BotaniaStateProps.BIOMESTONEWALL_VARIANT.getAllowedValues()) { - String variantName = "inventory_" + variant.getName(); - ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName)); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":" + variant.getName() + "_wall", "inventory")); } registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall"); diff --git a/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json b/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json new file mode 100644 index 000000000..8705b2a52 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/desert_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:desert_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:desert_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json b/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json new file mode 100644 index 000000000..71f9c1d4b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forest_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:forest_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:forest_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json b/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json new file mode 100644 index 000000000..c503bf282 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/fungal_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:fungal_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json b/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json new file mode 100644 index 000000000..a960b7bec --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mesa_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:mesa_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json b/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json new file mode 100644 index 000000000..2606d1a7a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mountain_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:mountain_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json b/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json new file mode 100644 index 000000000..948c22f9c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/plains_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:plains_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:plains_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json b/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json new file mode 100644 index 000000000..a05e64004 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/swamp_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:swamp_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json b/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json new file mode 100644 index 000000000..ce48b7bc7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/taiga_cobble_wall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:taiga_cobble_wall_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json new file mode 100644 index 000000000..33636683b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json new file mode 100644 index 000000000..c8943f49c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/desert_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json new file mode 100644 index 000000000..0a10f6f38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json new file mode 100644 index 000000000..0ca607833 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/forest_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json new file mode 100644 index 000000000..ce1756c91 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json new file mode 100644 index 000000000..7abed6202 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fungal_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json new file mode 100644 index 000000000..8fb930ad8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json new file mode 100644 index 000000000..c968443d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mesa_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json new file mode 100644 index 000000000..b00803b65 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json new file mode 100644 index 000000000..350481030 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mountain_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json new file mode 100644 index 000000000..6ea6ee189 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json new file mode 100644 index 000000000..7b2077e0a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/plains_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json new file mode 100644 index 000000000..67d8fe9fa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json new file mode 100644 index 000000000..cbda4914e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/swamp_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json new file mode 100644 index 000000000..20ac75792 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "botania:blocks/biomeStone14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json new file mode 100644 index 000000000..4fa74426f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/taiga_cobble_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "botania:blocks/biomeStone14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desert_cobble_wall.json b/src/main/resources/assets/botania/models/item/desert_cobble_wall.json new file mode 100644 index 000000000..c3487cd69 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desert_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/forest_cobble_wall.json b/src/main/resources/assets/botania/models/item/forest_cobble_wall.json new file mode 100644 index 000000000..9cde1a1d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/forest_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json b/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json new file mode 100644 index 000000000..00845bd40 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fungal_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json b/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json new file mode 100644 index 000000000..4b6794cfd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mesa_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json b/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json new file mode 100644 index 000000000..0c229f43c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mountain_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/plains_cobble_wall.json b/src/main/resources/assets/botania/models/item/plains_cobble_wall.json new file mode 100644 index 000000000..14a90dc0c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/plains_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json b/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json new file mode 100644 index 000000000..3367852d2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/swamp_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json b/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json new file mode 100644 index 000000000..18efd12a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/taiga_cobble_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "botania:blocks/biomeStone14" + } +} \ No newline at end of file