From 784844914ae2d22cf0b099b5640cf06898a56685 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jan 2020 21:34:24 -0600 Subject: [PATCH] Datagenerate red string blockstates --- .../blockstates/red_string_comparator.json | 27 +++++++++++++++++++ .../blockstates/red_string_container.json | 27 +++++++++++++++++++ .../blockstates/red_string_dispenser.json | 27 +++++++++++++++++++ .../blockstates/red_string_fertilizer.json | 27 +++++++++++++++++++ .../blockstates/red_string_interceptor.json | 27 +++++++++++++++++++ .../botania/blockstates/red_string_relay.json | 27 +++++++++++++++++++ .../botania/data/BlockstateProvider.java | 16 ++++++++++- .../blockstates/red_string_comparator.json | 10 ------- .../blockstates/red_string_container.json | 10 ------- .../blockstates/red_string_dispenser.json | 10 ------- .../blockstates/red_string_fertilizer.json | 10 ------- .../blockstates/red_string_interceptor.json | 10 ------- .../botania/blockstates/red_string_relay.json | 10 ------- 13 files changed, 177 insertions(+), 61 deletions(-) create mode 100644 src/generated/resources/assets/botania/blockstates/red_string_comparator.json create mode 100644 src/generated/resources/assets/botania/blockstates/red_string_container.json create mode 100644 src/generated/resources/assets/botania/blockstates/red_string_dispenser.json create mode 100644 src/generated/resources/assets/botania/blockstates/red_string_fertilizer.json create mode 100644 src/generated/resources/assets/botania/blockstates/red_string_interceptor.json create mode 100644 src/generated/resources/assets/botania/blockstates/red_string_relay.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_string_comparator.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_string_container.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_string_dispenser.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_string_fertilizer.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_string_interceptor.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_string_relay.json diff --git a/src/generated/resources/assets/botania/blockstates/red_string_comparator.json b/src/generated/resources/assets/botania/blockstates/red_string_comparator.json new file mode 100644 index 000000000..60a745636 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_string_comparator.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "botania:block/red_string_comparator", + "x": 90 + }, + "facing=up": { + "model": "botania:block/red_string_comparator", + "x": 270 + }, + "facing=north": { + "model": "botania:block/red_string_comparator" + }, + "facing=south": { + "model": "botania:block/red_string_comparator", + "y": 180 + }, + "facing=west": { + "model": "botania:block/red_string_comparator", + "y": 270 + }, + "facing=east": { + "model": "botania:block/red_string_comparator", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/red_string_container.json b/src/generated/resources/assets/botania/blockstates/red_string_container.json new file mode 100644 index 000000000..a57da86e9 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_string_container.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "botania:block/red_string_container", + "x": 90 + }, + "facing=up": { + "model": "botania:block/red_string_container", + "x": 270 + }, + "facing=north": { + "model": "botania:block/red_string_container" + }, + "facing=south": { + "model": "botania:block/red_string_container", + "y": 180 + }, + "facing=west": { + "model": "botania:block/red_string_container", + "y": 270 + }, + "facing=east": { + "model": "botania:block/red_string_container", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/red_string_dispenser.json b/src/generated/resources/assets/botania/blockstates/red_string_dispenser.json new file mode 100644 index 000000000..f57883811 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_string_dispenser.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "botania:block/red_string_dispenser", + "x": 90 + }, + "facing=up": { + "model": "botania:block/red_string_dispenser", + "x": 270 + }, + "facing=north": { + "model": "botania:block/red_string_dispenser" + }, + "facing=south": { + "model": "botania:block/red_string_dispenser", + "y": 180 + }, + "facing=west": { + "model": "botania:block/red_string_dispenser", + "y": 270 + }, + "facing=east": { + "model": "botania:block/red_string_dispenser", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/red_string_fertilizer.json b/src/generated/resources/assets/botania/blockstates/red_string_fertilizer.json new file mode 100644 index 000000000..f599e04d7 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_string_fertilizer.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "botania:block/red_string_fertilizer", + "x": 90 + }, + "facing=up": { + "model": "botania:block/red_string_fertilizer", + "x": 270 + }, + "facing=north": { + "model": "botania:block/red_string_fertilizer" + }, + "facing=south": { + "model": "botania:block/red_string_fertilizer", + "y": 180 + }, + "facing=west": { + "model": "botania:block/red_string_fertilizer", + "y": 270 + }, + "facing=east": { + "model": "botania:block/red_string_fertilizer", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/red_string_interceptor.json b/src/generated/resources/assets/botania/blockstates/red_string_interceptor.json new file mode 100644 index 000000000..cfb0d8998 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_string_interceptor.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "botania:block/red_string_interceptor", + "x": 90 + }, + "facing=up": { + "model": "botania:block/red_string_interceptor", + "x": 270 + }, + "facing=north": { + "model": "botania:block/red_string_interceptor" + }, + "facing=south": { + "model": "botania:block/red_string_interceptor", + "y": 180 + }, + "facing=west": { + "model": "botania:block/red_string_interceptor", + "y": 270 + }, + "facing=east": { + "model": "botania:block/red_string_interceptor", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/red_string_relay.json b/src/generated/resources/assets/botania/blockstates/red_string_relay.json new file mode 100644 index 000000000..1c4edb296 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_string_relay.json @@ -0,0 +1,27 @@ +{ + "variants": { + "facing=down": { + "model": "botania:block/red_string_relay", + "x": 90 + }, + "facing=up": { + "model": "botania:block/red_string_relay", + "x": 270 + }, + "facing=north": { + "model": "botania:block/red_string_relay" + }, + "facing=south": { + "model": "botania:block/red_string_relay", + "y": 180 + }, + "facing=west": { + "model": "botania:block/red_string_relay", + "y": 270 + }, + "facing=east": { + "model": "botania:block/red_string_relay", + "y": 90 + } + } +} \ 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 e4757bdca..0d94b384b 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -1,5 +1,6 @@ package vazkii.botania.data; +import net.minecraft.block.Block; import net.minecraft.block.FenceBlock; import net.minecraft.block.FenceGateBlock; import net.minecraft.block.FlowerBlock; @@ -53,7 +54,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 BlockRedString || b instanceof BlockFloatingFlower + if (b instanceof BlockFloatingFlower || b == ModBlocks.craftCrate || b == ModBlocks.ghostRail || b == ModBlocks.solidVines) return; @@ -116,6 +117,8 @@ public class BlockstateProvider extends BlockStateProvider { } else if (b instanceof BlockPetalBlock) { ModelFile file = models().getExistingFile(prefix("block/petal_block")); getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file)); + } else if (b instanceof BlockRedString) { + redStringBlock(b); } else if (b == ModBlocks.elfGlass) { ConfiguredModel[] files = IntStream.rangeClosed(0, 3) .mapToObj(i -> models().getExistingFile(prefix("block/" + name + "_" + i))) @@ -137,4 +140,15 @@ public class BlockstateProvider extends BlockStateProvider { } }); } + + private void redStringBlock(Block b) { + ModelFile file = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath())); + getVariantBuilder(b) + .partialState().with(BotaniaStateProps.FACING, Direction.NORTH).setModels(new ConfiguredModel(file)) + .partialState().with(BotaniaStateProps.FACING, Direction.SOUTH).setModels(new ConfiguredModel(file, 0, 180, false)) + .partialState().with(BotaniaStateProps.FACING, Direction.WEST).setModels(new ConfiguredModel(file, 0, 270, false)) + .partialState().with(BotaniaStateProps.FACING, Direction.EAST).setModels(new ConfiguredModel(file, 0, 90, false)) + .partialState().with(BotaniaStateProps.FACING, Direction.DOWN).setModels(new ConfiguredModel(file, 90, 0, false)) + .partialState().with(BotaniaStateProps.FACING, Direction.UP).setModels(new ConfiguredModel(file, 270, 0, false)); + } } diff --git a/src/main/resources/assets/botania/blockstates/red_string_comparator.json b/src/main/resources/assets/botania/blockstates/red_string_comparator.json deleted file mode 100644 index 679473882..000000000 --- a/src/main/resources/assets/botania/blockstates/red_string_comparator.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/red_string_comparator" }, - "facing=south": { "model": "botania:block/red_string_comparator", "y": 180 }, - "facing=west": { "model": "botania:block/red_string_comparator", "y": 270 }, - "facing=east": { "model": "botania:block/red_string_comparator", "y": 90 }, - "facing=up": { "model": "botania:block/red_string_comparator", "x": 270 }, - "facing=down": { "model": "botania:block/red_string_comparator", "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_string_container.json b/src/main/resources/assets/botania/blockstates/red_string_container.json deleted file mode 100644 index 7830d77b5..000000000 --- a/src/main/resources/assets/botania/blockstates/red_string_container.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/red_string_container" }, - "facing=south": { "model": "botania:block/red_string_container", "y": 180 }, - "facing=west": { "model": "botania:block/red_string_container", "y": 270 }, - "facing=east": { "model": "botania:block/red_string_container", "y": 90 }, - "facing=up": { "model": "botania:block/red_string_container", "x": 270 }, - "facing=down": { "model": "botania:block/red_string_container", "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_string_dispenser.json b/src/main/resources/assets/botania/blockstates/red_string_dispenser.json deleted file mode 100644 index 5a640759c..000000000 --- a/src/main/resources/assets/botania/blockstates/red_string_dispenser.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/red_string_dispenser" }, - "facing=south": { "model": "botania:block/red_string_dispenser", "y": 180 }, - "facing=west": { "model": "botania:block/red_string_dispenser", "y": 270 }, - "facing=east": { "model": "botania:block/red_string_dispenser", "y": 90 }, - "facing=up": { "model": "botania:block/red_string_dispenser", "x": 270 }, - "facing=down": { "model": "botania:block/red_string_dispenser", "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_string_fertilizer.json b/src/main/resources/assets/botania/blockstates/red_string_fertilizer.json deleted file mode 100644 index 3e365d68e..000000000 --- a/src/main/resources/assets/botania/blockstates/red_string_fertilizer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/red_string_fertilizer" }, - "facing=south": { "model": "botania:block/red_string_fertilizer", "y": 180 }, - "facing=west": { "model": "botania:block/red_string_fertilizer", "y": 270 }, - "facing=east": { "model": "botania:block/red_string_fertilizer", "y": 90 }, - "facing=up": { "model": "botania:block/red_string_fertilizer", "x": 270 }, - "facing=down": { "model": "botania:block/red_string_fertilizer", "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_string_interceptor.json b/src/main/resources/assets/botania/blockstates/red_string_interceptor.json deleted file mode 100644 index c5895632f..000000000 --- a/src/main/resources/assets/botania/blockstates/red_string_interceptor.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/red_string_interceptor" }, - "facing=south": { "model": "botania:block/red_string_interceptor", "y": 180 }, - "facing=west": { "model": "botania:block/red_string_interceptor", "y": 270 }, - "facing=east": { "model": "botania:block/red_string_interceptor", "y": 90 }, - "facing=up": { "model": "botania:block/red_string_interceptor", "x": 270 }, - "facing=down": { "model": "botania:block/red_string_interceptor", "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/red_string_relay.json b/src/main/resources/assets/botania/blockstates/red_string_relay.json deleted file mode 100644 index 2c907312c..000000000 --- a/src/main/resources/assets/botania/blockstates/red_string_relay.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "botania:block/red_string_relay" }, - "facing=south": { "model": "botania:block/red_string_relay", "y": 180 }, - "facing=west": { "model": "botania:block/red_string_relay", "y": 270 }, - "facing=east": { "model": "botania:block/red_string_relay", "y": 90 }, - "facing=up": { "model": "botania:block/red_string_relay", "x": 270 }, - "facing=down": { "model": "botania:block/red_string_relay", "x": 90 } - } -} \ No newline at end of file