From 3f43b026860a32e4c8048187fb0fb0b7dc0eac1a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jan 2020 17:07:01 -0600 Subject: [PATCH] Fix missing random rotations for altgrasses --- .../assets/botania/blockstates/dry_grass.json | 20 ++++++++++++++++--- .../botania/blockstates/golden_grass.json | 20 ++++++++++++++++--- .../botania/blockstates/infused_grass.json | 20 ++++++++++++++++--- .../botania/blockstates/mutated_grass.json | 20 ++++++++++++++++--- .../botania/blockstates/scorched_grass.json | 20 ++++++++++++++++--- .../botania/blockstates/vivid_grass.json | 20 ++++++++++++++++--- .../botania/data/BlockstateProvider.java | 9 ++++++++- 7 files changed, 110 insertions(+), 19 deletions(-) diff --git a/src/generated/resources/assets/botania/blockstates/dry_grass.json b/src/generated/resources/assets/botania/blockstates/dry_grass.json index 82ba233a8..b0ceb94f6 100644 --- a/src/generated/resources/assets/botania/blockstates/dry_grass.json +++ b/src/generated/resources/assets/botania/blockstates/dry_grass.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "botania:block/dry_grass" - } + "": [ + { + "model": "botania:block/dry_grass" + }, + { + "model": "botania:block/dry_grass", + "y": 90 + }, + { + "model": "botania:block/dry_grass", + "y": 180 + }, + { + "model": "botania:block/dry_grass", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/golden_grass.json b/src/generated/resources/assets/botania/blockstates/golden_grass.json index 155ba1b91..7ecfcd5c6 100644 --- a/src/generated/resources/assets/botania/blockstates/golden_grass.json +++ b/src/generated/resources/assets/botania/blockstates/golden_grass.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "botania:block/golden_grass" - } + "": [ + { + "model": "botania:block/golden_grass" + }, + { + "model": "botania:block/golden_grass", + "y": 90 + }, + { + "model": "botania:block/golden_grass", + "y": 180 + }, + { + "model": "botania:block/golden_grass", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/infused_grass.json b/src/generated/resources/assets/botania/blockstates/infused_grass.json index 9d69a44b5..5f53aeb64 100644 --- a/src/generated/resources/assets/botania/blockstates/infused_grass.json +++ b/src/generated/resources/assets/botania/blockstates/infused_grass.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "botania:block/infused_grass" - } + "": [ + { + "model": "botania:block/infused_grass" + }, + { + "model": "botania:block/infused_grass", + "y": 90 + }, + { + "model": "botania:block/infused_grass", + "y": 180 + }, + { + "model": "botania:block/infused_grass", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/mutated_grass.json b/src/generated/resources/assets/botania/blockstates/mutated_grass.json index 97d963667..d5320d028 100644 --- a/src/generated/resources/assets/botania/blockstates/mutated_grass.json +++ b/src/generated/resources/assets/botania/blockstates/mutated_grass.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "botania:block/mutated_grass" - } + "": [ + { + "model": "botania:block/mutated_grass" + }, + { + "model": "botania:block/mutated_grass", + "y": 90 + }, + { + "model": "botania:block/mutated_grass", + "y": 180 + }, + { + "model": "botania:block/mutated_grass", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/scorched_grass.json b/src/generated/resources/assets/botania/blockstates/scorched_grass.json index 5cac2180b..9fe8f80c1 100644 --- a/src/generated/resources/assets/botania/blockstates/scorched_grass.json +++ b/src/generated/resources/assets/botania/blockstates/scorched_grass.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "botania:block/scorched_grass" - } + "": [ + { + "model": "botania:block/scorched_grass" + }, + { + "model": "botania:block/scorched_grass", + "y": 90 + }, + { + "model": "botania:block/scorched_grass", + "y": 180 + }, + { + "model": "botania:block/scorched_grass", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/vivid_grass.json b/src/generated/resources/assets/botania/blockstates/vivid_grass.json index 0e4857ee6..566b8b8c7 100644 --- a/src/generated/resources/assets/botania/blockstates/vivid_grass.json +++ b/src/generated/resources/assets/botania/blockstates/vivid_grass.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "botania:block/vivid_grass" - } + "": [ + { + "model": "botania:block/vivid_grass" + }, + { + "model": "botania:block/vivid_grass", + "y": 90 + }, + { + "model": "botania:block/vivid_grass", + "y": 180 + }, + { + "model": "botania:block/vivid_grass", + "y": 270 + } + ] } } \ 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 fc92335b0..df11c02df 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -15,6 +15,7 @@ import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ExistingFileHelper; import net.minecraftforge.client.model.generators.ModelFile; import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.BlockAltGrass; import vazkii.botania.common.block.BlockAltar; import vazkii.botania.common.block.BlockModDoubleFlower; import vazkii.botania.common.block.ModBlocks; @@ -55,7 +56,13 @@ public class BlockstateProvider extends BlockStateProvider { || b == ModBlocks.pump || b == ModBlocks.incensePlate || b == ModBlocks.felPumpkin || b == ModBlocks.solidVines) return; - if (b == ModBlocks.gaiaHead || b == ModBlocks.gaiaHeadWall) { + if (b instanceof BlockAltGrass) { + ModelFile model = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath())); + getVariantBuilder(b).partialState().setModels(new ConfiguredModel(model), + new ConfiguredModel(model, 0, 90, false), + new ConfiguredModel(model, 0, 180, false), + new ConfiguredModel(model, 0, 270, false)); + } else if (b == ModBlocks.gaiaHead || b == ModBlocks.gaiaHeadWall) { ModelFile file = models().getExistingFile(new ResourceLocation("block/soul_sand")); getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file)); } else if (b instanceof BlockPetalBlock) {