From 2404503e1b1556689853bf6925191c5de43f798c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jul 2020 12:01:28 -0500 Subject: [PATCH] Generate fences, gates, elfglass, fix fel pumpkin --- .../botania/blockstates/fel_pumpkin.json | 7 +++++ .../models/block/dreamwood_fence_gate.json | 4 +-- .../block/dreamwood_fence_gate_open.json | 4 +-- .../block/dreamwood_fence_gate_wall.json | 4 +-- .../block/dreamwood_fence_gate_wall_open.json | 6 ++++ .../models/block/dreamwood_fence_post.json | 4 +-- .../models/block/dreamwood_fence_side.json | 4 +-- .../botania/models/block/elf_glass_0.json | 6 ++++ .../botania/models/block/elf_glass_1.json | 6 ++++ .../botania/models/block/elf_glass_2.json | 6 ++++ .../botania/models/block/elf_glass_3.json | 6 ++++ .../models/block/livingwood_fence_gate.json | 4 +-- .../block/livingwood_fence_gate_open.json | 4 +-- .../block/livingwood_fence_gate_wall.json | 4 +-- .../livingwood_fence_gate_wall_open.json | 6 ++++ .../models/block/livingwood_fence_post.json | 4 +-- .../models/block/livingwood_fence_side.json | 4 +-- .../botania/data/BlockstateProvider.java | 29 ++++++++++-------- .../block/dreamwood_fence_gate_wall_open.json | 6 ---- .../botania/models/block/elf_glass_0.json | 6 ---- .../botania/models/block/elf_glass_1.json | 6 ---- .../botania/models/block/elf_glass_2.json | 6 ---- .../botania/models/block/elf_glass_3.json | 6 ---- .../livingwood_fence_gate_wall_open.json | 6 ---- .../block/{elfglass0.png => elf_glass_0.png} | Bin .../block/{elfglass1.png => elf_glass_1.png} | Bin .../block/{elfglass2.png => elf_glass_2.png} | Bin .../block/{elfglass3.png => elf_glass_3.png} | Bin 28 files changed, 79 insertions(+), 69 deletions(-) create mode 100644 src/generated/resources/assets/botania/blockstates/fel_pumpkin.json rename src/{main => generated}/resources/assets/botania/models/block/dreamwood_fence_gate.json (56%) rename src/{main => generated}/resources/assets/botania/models/block/dreamwood_fence_gate_open.json (54%) rename src/{main => generated}/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json (54%) create mode 100644 src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json rename src/{main => generated}/resources/assets/botania/models/block/dreamwood_fence_post.json (61%) rename src/{main => generated}/resources/assets/botania/models/block/dreamwood_fence_side.json (61%) create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_0.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_1.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_2.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_3.json rename src/{main => generated}/resources/assets/botania/models/block/livingwood_fence_gate.json (57%) rename src/{main => generated}/resources/assets/botania/models/block/livingwood_fence_gate_open.json (55%) rename src/{main => generated}/resources/assets/botania/models/block/livingwood_fence_gate_wall.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json rename src/{main => generated}/resources/assets/botania/models/block/livingwood_fence_post.json (61%) rename src/{main => generated}/resources/assets/botania/models/block/livingwood_fence_side.json (61%) delete mode 100644 src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_0.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_1.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_2.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_3.json delete mode 100644 src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json rename src/main/resources/assets/botania/textures/block/{elfglass0.png => elf_glass_0.png} (100%) rename src/main/resources/assets/botania/textures/block/{elfglass1.png => elf_glass_1.png} (100%) rename src/main/resources/assets/botania/textures/block/{elfglass2.png => elf_glass_2.png} (100%) rename src/main/resources/assets/botania/textures/block/{elfglass3.png => elf_glass_3.png} (100%) diff --git a/src/generated/resources/assets/botania/blockstates/fel_pumpkin.json b/src/generated/resources/assets/botania/blockstates/fel_pumpkin.json new file mode 100644 index 000000000..d8843b921 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/fel_pumpkin.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/fel_pumpkin" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate.json similarity index 56% rename from src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json rename to src/generated/resources/assets/botania/models/block/dreamwood_fence_gate.json index f4e2df89d..9e1ab8cf6 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_fence_gate", + "parent": "block/template_fence_gate", "textures": { "texture": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_open.json similarity index 54% rename from src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json rename to src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_open.json index c56cc8f35..aa6d16f4c 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_fence_gate_open", + "parent": "block/template_fence_gate_open", "textures": { "texture": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json similarity index 54% rename from src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json rename to src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json index 1fa08a228..56b5a2d46 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_fence_gate_wall", + "parent": "block/template_fence_gate_wall", "textures": { "texture": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json new file mode 100644 index 000000000..8d1025eb5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "botania:block/dreamwood_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json b/src/generated/resources/assets/botania/models/block/dreamwood_fence_post.json similarity index 61% rename from src/main/resources/assets/botania/models/block/dreamwood_fence_post.json rename to src/generated/resources/assets/botania/models/block/dreamwood_fence_post.json index b485f127e..8690077e5 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood_fence_post.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/fence_post", + "parent": "block/fence_post", "textures": { "texture": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json b/src/generated/resources/assets/botania/models/block/dreamwood_fence_side.json similarity index 61% rename from src/main/resources/assets/botania/models/block/dreamwood_fence_side.json rename to src/generated/resources/assets/botania/models/block/dreamwood_fence_side.json index 28d20a447..fcfd13c4c 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood_fence_side.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/fence_side", + "parent": "block/fence_side", "textures": { "texture": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_0.json b/src/generated/resources/assets/botania/models/block/elf_glass_0.json new file mode 100644 index 000000000..d6298ce5c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "botania:block/elf_glass_0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_1.json b/src/generated/resources/assets/botania/models/block/elf_glass_1.json new file mode 100644 index 000000000..330f0a2d5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "botania:block/elf_glass_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_2.json b/src/generated/resources/assets/botania/models/block/elf_glass_2.json new file mode 100644 index 000000000..ed9875678 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "botania:block/elf_glass_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_3.json b/src/generated/resources/assets/botania/models/block/elf_glass_3.json new file mode 100644 index 000000000..e464914c1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "botania:block/elf_glass_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate.json similarity index 57% rename from src/main/resources/assets/botania/models/block/livingwood_fence_gate.json rename to src/generated/resources/assets/botania/models/block/livingwood_fence_gate.json index 82a5db44e..f6996308c 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json +++ b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_fence_gate", + "parent": "block/template_fence_gate", "textures": { "texture": "botania:block/livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_open.json similarity index 55% rename from src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json rename to src/generated/resources/assets/botania/models/block/livingwood_fence_gate_open.json index c4de1ef36..d549b1516 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json +++ b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_fence_gate_open", + "parent": "block/template_fence_gate_open", "textures": { "texture": "botania:block/livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall.json similarity index 55% rename from src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json rename to src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall.json index 1e6d04297..9c0329c12 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json +++ b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/template_fence_gate_wall", + "parent": "block/template_fence_gate_wall", "textures": { "texture": "botania:block/livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json new file mode 100644 index 000000000..9dc575e68 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "botania:block/livingwood_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_post.json b/src/generated/resources/assets/botania/models/block/livingwood_fence_post.json similarity index 61% rename from src/main/resources/assets/botania/models/block/livingwood_fence_post.json rename to src/generated/resources/assets/botania/models/block/livingwood_fence_post.json index 1cf975c1b..f4f74ae0b 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_post.json +++ b/src/generated/resources/assets/botania/models/block/livingwood_fence_post.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/fence_post", + "parent": "block/fence_post", "textures": { "texture": "botania:block/livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_side.json b/src/generated/resources/assets/botania/models/block/livingwood_fence_side.json similarity index 61% rename from src/main/resources/assets/botania/models/block/livingwood_fence_side.json rename to src/generated/resources/assets/botania/models/block/livingwood_fence_side.json index 92d3a52d8..fb6ae41cf 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_side.json +++ b/src/generated/resources/assets/botania/models/block/livingwood_fence_side.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/fence_side", + "parent": "block/fence_side", "textures": { "texture": "botania:block/livingwood_planks" } -} +} \ 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 22a4dc02f..5ff274c33 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -42,6 +42,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import static vazkii.botania.common.block.ModBlocks.*; +import static vazkii.botania.common.block.ModFluffBlocks.*; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public class BlockstateProvider extends BlockStateProvider { @@ -73,7 +74,10 @@ public class BlockstateProvider extends BlockStateProvider { // Single blocks String elfGlassName = Registry.BLOCK.getKey(elfGlass).getPath(); ConfiguredModel[] elfGlassFiles = IntStream.rangeClosed(0, 3) - .mapToObj(i -> models().getExistingFile(prefix("block/" + elfGlassName + "_" + i))) + .mapToObj(i -> { + String varName = elfGlassName + "_" + i; + return models().cubeAll(varName, prefix("block/" + varName)); + }) .map(ConfiguredModel::new).toArray(ConfiguredModel[]::new); getVariantBuilder(elfGlass).partialState().setModels(elfGlassFiles); blocks.remove(elfGlass); @@ -90,9 +94,18 @@ public class BlockstateProvider extends BlockStateProvider { blocks.remove(ModFluffBlocks.livingrockWall); blocks.remove(ModFluffBlocks.livingwoodWall); + fenceBlock((FenceBlock) dreamwoodFence, prefix("block/dreamwood_planks")); + fenceGateBlock((FenceGateBlock) dreamwoodFenceGate, prefix("block/dreamwood_planks")); + fenceBlock((FenceBlock) livingwoodFence, prefix("block/livingwood_planks")); + fenceGateBlock((FenceGateBlock) livingwoodFenceGate, prefix("block/livingwood_planks")); + blocks.remove(dreamwoodFence); + blocks.remove(dreamwoodFenceGate); + blocks.remove(livingwoodFence); + blocks.remove(livingwoodFenceGate); + String felName = Registry.BLOCK.getKey(felPumpkin).getPath(); - models().orientable(felName, new ResourceLocation("block/pumpkin_side"), prefix("block/" + felName), - new ResourceLocation("block/pumpkin_top")); + simpleBlock(felPumpkin, models().orientable(felName, new ResourceLocation("block/pumpkin_side"), prefix("block/" + felName), + new ResourceLocation("block/pumpkin_top"))); blocks.remove(felPumpkin); // TESRs with only particles @@ -244,16 +257,6 @@ public class BlockstateProvider extends BlockStateProvider { .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(file, 90, 90, false)) .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).setModels(new ConfiguredModel(file)) .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).setModels(new ConfiguredModel(file, 90, 0, false)); - } 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 PaneBlock) { ModelFile post = models().getExistingFile(prefix("block/" + name + "_post")); ModelFile side = models().getExistingFile(prefix("block/" + name + "_side")); diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json deleted file mode 100644 index 146ebc1aa..000000000 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "botania:block/dreamwood_planks" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_0.json b/src/main/resources/assets/botania/models/block/elf_glass_0.json deleted file mode 100644 index 9d73e20f3..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:block/elfglass0" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_1.json b/src/main/resources/assets/botania/models/block/elf_glass_1.json deleted file mode 100644 index a56a260a9..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:block/elfglass1" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_2.json b/src/main/resources/assets/botania/models/block/elf_glass_2.json deleted file mode 100644 index b3596b903..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:block/elfglass2" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_3.json b/src/main/resources/assets/botania/models/block/elf_glass_3.json deleted file mode 100644 index fbfbf9810..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:block/elfglass3" - } -} diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json deleted file mode 100644 index fe61aa4a4..000000000 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "botania:block/livingwood_planks" - } -} diff --git a/src/main/resources/assets/botania/textures/block/elfglass0.png b/src/main/resources/assets/botania/textures/block/elf_glass_0.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/elfglass0.png rename to src/main/resources/assets/botania/textures/block/elf_glass_0.png diff --git a/src/main/resources/assets/botania/textures/block/elfglass1.png b/src/main/resources/assets/botania/textures/block/elf_glass_1.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/elfglass1.png rename to src/main/resources/assets/botania/textures/block/elf_glass_1.png diff --git a/src/main/resources/assets/botania/textures/block/elfglass2.png b/src/main/resources/assets/botania/textures/block/elf_glass_2.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/elfglass2.png rename to src/main/resources/assets/botania/textures/block/elf_glass_2.png diff --git a/src/main/resources/assets/botania/textures/block/elfglass3.png b/src/main/resources/assets/botania/textures/block/elf_glass_3.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/elfglass3.png rename to src/main/resources/assets/botania/textures/block/elf_glass_3.png