Fix some walls being flipped, separate the models out

This commit is contained in:
Vincent Lee committed 2016-07-23 15:31:18 -05:00
1 parent 83d0b8dc12
commit a5d688883e
13 files changed
+105 -90

No files matched your search

@@ -811,9 +811,9 @@ public final class ModelHandler {
ModelLoader.setCustomModelResourceLocation(item, variant.ordinal() - 8, new ModelResourceLocation("botania:biomeStoneA0Wall", variantName));
}
registerItemModel(ModFluffBlocks.livingrockWall);
registerItemModel(ModFluffBlocks.livingwoodWall);
registerItemModel(ModFluffBlocks.dreamwoodWall);
registerBlock(ModFluffBlocks.livingrockWall, "livingrock_wall");
registerBlock(ModFluffBlocks.livingwoodWall, "livingwood_wall");
registerBlock(ModFluffBlocks.dreamwoodWall, "dreamwood_wall");
}
private static void registerPanes() {
@@ -883,6 +883,12 @@ public final class ModelHandler {
}
}
private static void registerBlock(Block b, String name) {
ModelLoader.setCustomModelResourceLocation(
Item.getItemFromBlock(b), 0,
new ModelResourceLocation(LibMisc.MOD_ID + ":" + name, "inventory"));
}
private static void registerItemModel(Block b) {
registerItemModel(Item.getItemFromBlock(b));
}
@@ -1,34 +1,19 @@
{
"forge_marker": 1,
"defaults": {
"model": "botania:dummy",
"uvlock": true,
"transform": "forge:default-block",
"textures": { "particle": "#wall", "wall": "botania:blocks/dreamwood0" }
},
"variants": {
"north": {
"true": { "submodel": "minecraft:wall_side" },
"false": {}
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "botania:dreamwood_wall_post" }
},
"south": {
"true": { "submodel": "minecraft:wall_side", "y": 180 },
"false": {}
{ "when": { "north": "true" },
"apply": { "model": "botania:dreamwood_wall_side", "uvlock": true }
},
"west": {
"true": { "submodel": "minecraft:wall_side", "y": 270 },
"false": {}
{ "when": { "east": "true" },
"apply": { "model": "botania:dreamwood_wall_side", "y": 90, "uvlock": true }
},
"east": {
"true": { "submodel": "minecraft:wall_side", "y": 90 },
"false": {}
{ "when": { "south": "true" },
"apply": { "model": "botania:dreamwood_wall_side", "y": 180, "uvlock": true }
},
"up": {
"true": { "submodel": "minecraft:wall_post" },
"false": {}
},
"inventory": [{
"model": "minecraft:wall_inventory"
}]
}
}
{ "when": { "west": "true" },
"apply": { "model": "botania:dreamwood_wall_side", "y": 270, "uvlock": true }
}
]
}
@@ -1,34 +1,19 @@
{
"forge_marker": 1,
"defaults": {
"model": "botania:dummy",
"uvlock": true,
"transform": "forge:default-block",
"textures": { "particle": "#wall", "wall": "botania:blocks/livingrock0" }
},
"variants": {
"north": {
"true": { "submodel": "minecraft:wall_side" },
"false": {}
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "botania:livingrock_wall_post" }
},
"south": {
"true": { "submodel": "minecraft:wall_side", "y": 180 },
"false": {}
{ "when": { "north": "true" },
"apply": { "model": "botania:livingrock_wall_side", "uvlock": true }
},
"west": {
"true": { "submodel": "minecraft:wall_side", "y": 270 },
"false": {}
{ "when": { "east": "true" },
"apply": { "model": "botania:livingrock_wall_side", "y": 90, "uvlock": true }
},
"east": {
"true": { "submodel": "minecraft:wall_side", "y": 90 },
"false": {}
{ "when": { "south": "true" },
"apply": { "model": "botania:livingrock_wall_side", "y": 180, "uvlock": true }
},
"up": {
"true": { "submodel": "minecraft:wall_post" },
"false": {}
},
"inventory": [{
"model": "minecraft:wall_inventory"
}]
}
}
{ "when": { "west": "true" },
"apply": { "model": "botania:livingrock_wall_side", "y": 270, "uvlock": true }
}
]
}
@@ -1,34 +1,19 @@
{
"forge_marker": 1,
"defaults": {
"model": "botania:dummy",
"uvlock": true,
"transform": "forge:default-block",
"textures": { "particle": "#wall", "wall": "botania:blocks/livingwood0" }
},
"variants": {
"north": {
"true": { "submodel": "minecraft:wall_side" },
"false": {}
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "botania:livingwood_wall_post" }
},
"south": {
"true": { "submodel": "minecraft:wall_side", "y": 180 },
"false": {}
{ "when": { "north": "true" },
"apply": { "model": "botania:livingwood_wall_side", "uvlock": true }
},
"west": {
"true": { "submodel": "minecraft:wall_side", "y": 270 },
"false": {}
{ "when": { "east": "true" },
"apply": { "model": "botania:livingwood_wall_side", "y": 90, "uvlock": true }
},
"east": {
"true": { "submodel": "minecraft:wall_side", "y": 90 },
"false": {}
{ "when": { "south": "true" },
"apply": { "model": "botania:livingwood_wall_side", "y": 180, "uvlock": true }
},
"up": {
"true": { "submodel": "minecraft:wall_post" },
"false": {}
},
"inventory": [{
"model": "minecraft:wall_inventory"
}]
}
}
{ "when": { "west": "true" },
"apply": { "model": "botania:livingwood_wall_side", "y": 270, "uvlock": true }
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_post",
"textures": {
"wall": "botania:blocks/dreamwood0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_side",
"textures": {
"wall": "botania:blocks/dreamwood0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_post",
"textures": {
"wall": "botania:blocks/livingrock0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_side",
"textures": {
"wall": "botania:blocks/livingrock0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_post",
"textures": {
"wall": "botania:blocks/livingwood0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_side",
"textures": {
"wall": "botania:blocks/livingwood0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_inventory",
"textures": {
"wall": "botania:blocks/dreamwood0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_inventory",
"textures": {
"wall": "botania:blocks/livingrock0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_inventory",
"textures": {
"wall": "botania:blocks/livingwood0"
}
}