diff --git a/src/generated/resources/assets/botania/blockstates/dreamwood_fence.json b/src/generated/resources/assets/botania/blockstates/dreamwood_fence.json new file mode 100644 index 000000000..bd6a54156 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/dreamwood_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "botania:block/dreamwood_fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "botania:block/dreamwood_fence_side", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "botania:block/dreamwood_fence_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "botania:block/dreamwood_fence_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "botania:block/dreamwood_fence_side", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/dreamwood_fence_gate.json b/src/generated/resources/assets/botania/blockstates/dreamwood_fence_gate.json new file mode 100644 index 000000000..cd100018e --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/dreamwood_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "botania:block/dreamwood_fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "botania:block/dreamwood_fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "botania:block/dreamwood_fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "botania:block/dreamwood_fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "botania:block/dreamwood_fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "botania:block/dreamwood_fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "botania:block/dreamwood_fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "botania:block/dreamwood_fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "botania:block/dreamwood_fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "botania:block/dreamwood_fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "botania:block/dreamwood_fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "botania:block/dreamwood_fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "botania:block/dreamwood_fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "botania:block/dreamwood_fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "botania:block/dreamwood_fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "botania:block/dreamwood_fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/livingwood_fence.json b/src/generated/resources/assets/botania/blockstates/livingwood_fence.json new file mode 100644 index 000000000..57dec2f45 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/livingwood_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "botania:block/livingwood_fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "botania:block/livingwood_fence_side", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "botania:block/livingwood_fence_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "botania:block/livingwood_fence_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "botania:block/livingwood_fence_side", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/livingwood_fence_gate.json b/src/generated/resources/assets/botania/blockstates/livingwood_fence_gate.json new file mode 100644 index 000000000..91c070392 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/livingwood_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "botania:block/livingwood_fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "botania:block/livingwood_fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "botania:block/livingwood_fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "botania:block/livingwood_fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "botania:block/livingwood_fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "botania:block/livingwood_fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "botania:block/livingwood_fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "botania:block/livingwood_fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "botania:block/livingwood_fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "botania:block/livingwood_fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "botania:block/livingwood_fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "botania:block/livingwood_fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "botania:block/livingwood_fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "botania:block/livingwood_fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "botania:block/livingwood_fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "botania:block/livingwood_fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index fc937b1e6..163bfda1f 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -50,7 +50,7 @@ public class BlockstateProvider extends BlockStateProvider { protected void registerStatesAndModels() { Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) .forEach(b -> { - if (b instanceof FenceBlock || b instanceof FenceGateBlock || b instanceof PaneBlock + if (b instanceof PaneBlock || b instanceof WallBlock || b instanceof FlowerBlock || b instanceof BlockAltar || b == ModBlocks.tinyPotato || b instanceof BlockRedString || b instanceof BlockFloatingFlower || b instanceof BlockModMushroom @@ -79,6 +79,16 @@ public class BlockstateProvider extends BlockStateProvider { ModelFile inner = models().getExistingFile(prefix("block/stairs/" + name + "_inner")); ModelFile outer = models().getExistingFile(prefix("block/stairs/" + name + "_outer")); stairsBlock((StairsBlock) b, stair, inner, outer); + } else if (b instanceof FenceBlock) { + ModelFile post = models().getExistingFile(prefix("block/" + name + "_post")); + ModelFile side = models().getExistingFile(prefix("block/" + name + "_side")); + fourWayBlock((FenceBlock) b, post, side); + } else if (b instanceof FenceGateBlock) { + ModelFile gate = models().getExistingFile(prefix("block/" + name)); + ModelFile gateOpen = models().getExistingFile(prefix("block/" + name + "_open")); + ModelFile wall = models().getExistingFile(prefix("block/" + name + "_wall")); + ModelFile wallOpen = models().getExistingFile(prefix("block/" + name + "_wall_open")); + fenceGateBlock((FenceGateBlock) b, gate, gateOpen, wall, wallOpen); } else if (b instanceof BlockAltGrass) { ModelFile model = models().getExistingFile(prefix("block/" + name)); getVariantBuilder(b).partialState().setModels(new ConfiguredModel(model), diff --git a/src/main/resources/assets/botania/blockstates/dreamwood_fence.json b/src/main/resources/assets/botania/blockstates/dreamwood_fence.json deleted file mode 100644 index 79c48f1c6..000000000 --- a/src/main/resources/assets/botania/blockstates/dreamwood_fence.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "botania:block/fences/dreamwood_fence_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "botania:block/fences/dreamwood_fence_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "botania:block/fences/dreamwood_fence_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "botania:block/fences/dreamwood_fence_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "botania:block/fences/dreamwood_fence_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/botania/blockstates/dreamwood_fence_gate.json b/src/main/resources/assets/botania/blockstates/dreamwood_fence_gate.json deleted file mode 100644 index 53d0beee4..000000000 --- a/src/main/resources/assets/botania/blockstates/dreamwood_fence_gate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true }, - "facing=west,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true, "y": 270 }, - "facing=south,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true }, - "facing=west,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true }, - "facing=west,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true, "y": 270 } - } -} diff --git a/src/main/resources/assets/botania/blockstates/livingwood_fence.json b/src/main/resources/assets/botania/blockstates/livingwood_fence.json deleted file mode 100644 index 3b18634e1..000000000 --- a/src/main/resources/assets/botania/blockstates/livingwood_fence.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "botania:block/fences/livingwood_fence_post" } - }, - { "when": { "north": "true" }, - "apply": { "model": "botania:block/fences/livingwood_fence_side", "uvlock": true } - }, - { "when": { "east": "true" }, - "apply": { "model": "botania:block/fences/livingwood_fence_side", "y": 90, "uvlock": true } - }, - { "when": { "south": "true" }, - "apply": { "model": "botania:block/fences/livingwood_fence_side", "y": 180, "uvlock": true } - }, - { "when": { "west": "true" }, - "apply": { "model": "botania:block/fences/livingwood_fence_side", "y": 270, "uvlock": true } - } - ] -} diff --git a/src/main/resources/assets/botania/blockstates/livingwood_fence_gate.json b/src/main/resources/assets/botania/blockstates/livingwood_fence_gate.json deleted file mode 100644 index 95df9fd6a..000000000 --- a/src/main/resources/assets/botania/blockstates/livingwood_fence_gate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true }, - "facing=west,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true, "y": 270 }, - "facing=south,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true }, - "facing=west,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true }, - "facing=west,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true, "y": 270 }, - "facing=south,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true, "y": 90 }, - "facing=north,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true, "y": 180 }, - "facing=east,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true, "y": 270 } - } -} diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate.json rename to src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_open.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_open.json rename to src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall.json rename to src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall_open.json rename to src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json diff --git a/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_post.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fences/dreamwood_fence_post.json rename to src/main/resources/assets/botania/models/block/dreamwood_fence_post.json diff --git a/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_side.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fences/dreamwood_fence_side.json rename to src/main/resources/assets/botania/models/block/dreamwood_fence_side.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate.json rename to src/main/resources/assets/botania/models/block/livingwood_fence_gate.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_open.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_open.json rename to src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall.json rename to src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall_open.json rename to src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json diff --git a/src/main/resources/assets/botania/models/block/fences/livingwood_fence_post.json b/src/main/resources/assets/botania/models/block/livingwood_fence_post.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fences/livingwood_fence_post.json rename to src/main/resources/assets/botania/models/block/livingwood_fence_post.json diff --git a/src/main/resources/assets/botania/models/block/fences/livingwood_fence_side.json b/src/main/resources/assets/botania/models/block/livingwood_fence_side.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fences/livingwood_fence_side.json rename to src/main/resources/assets/botania/models/block/livingwood_fence_side.json diff --git a/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json b/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json index 1c4488790..e41881c6c 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json +++ b/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json @@ -1,3 +1,3 @@ { - "parent": "botania:block/fence_gates/dreamwood_fence_gate" + "parent": "botania:block/dreamwood_fence_gate" } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json b/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json index 01de6cb09..84e5de254 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json +++ b/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json @@ -1,3 +1,3 @@ { - "parent": "botania:block/fence_gates/livingwood_fence_gate" + "parent": "botania:block/livingwood_fence_gate" } \ No newline at end of file