mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Generate more stuff (metamorphic, quartz, slabs, stairs
This commit is contained in:
1 parent
01e80c0f54
commit
e535b05ad0
407 files changed
+3015
-1327
No files matched your search
@@ -4,10 +4,13 @@ import net.minecraft.block.FenceBlock;
|
||||
import net.minecraft.block.FenceGateBlock;
|
||||
import net.minecraft.block.FlowerBlock;
|
||||
import net.minecraft.block.PaneBlock;
|
||||
import net.minecraft.block.RotatedPillarBlock;
|
||||
import net.minecraft.block.SlabBlock;
|
||||
import net.minecraft.block.StairsBlock;
|
||||
import net.minecraft.block.WallBlock;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.state.properties.SlabType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraftforge.client.model.generators.BlockStateProvider;
|
||||
@@ -23,6 +26,7 @@ import vazkii.botania.common.block.decor.BlockFloatingFlower;
|
||||
import vazkii.botania.common.block.decor.BlockModMushroom;
|
||||
import vazkii.botania.common.block.decor.BlockPetalBlock;
|
||||
import vazkii.botania.common.block.string.BlockRedString;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -47,22 +51,36 @@ public class BlockstateProvider extends BlockStateProvider {
|
||||
Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()))
|
||||
.forEach(b -> {
|
||||
if (b instanceof FenceBlock || b instanceof FenceGateBlock || b instanceof PaneBlock
|
||||
|| b instanceof SlabBlock || b instanceof WallBlock
|
||||
|| b instanceof WallBlock
|
||||
|| b instanceof FlowerBlock || b instanceof BlockAltar || b == ModBlocks.tinyPotato
|
||||
|| b instanceof BlockRedString || b instanceof BlockFloatingFlower || b instanceof BlockModMushroom
|
||||
|| b instanceof BlockModDoubleFlower || b.getRegistryName().getPath().contains("quartz")
|
||||
|| (b.getRegistryName().getPath().contains("metamorphic") && !b.getRegistryName().getPath().contains("stairs"))
|
||||
|| b instanceof BlockModDoubleFlower
|
||||
|| (b.getRegistryName().getPath().contains("metamorphic") && b.getRegistryName().getPath().contains("wall"))
|
||||
|| b == ModBlocks.craftCrate || b == ModBlocks.ghostRail
|
||||
|| b == ModBlocks.pump || b == ModBlocks.incensePlate || b == ModBlocks.felPumpkin || b == ModBlocks.solidVines)
|
||||
return;
|
||||
|
||||
if (b instanceof StairsBlock) {
|
||||
ModelFile stair = models().getExistingFile(prefix("block/stairs/" + b.getRegistryName().getPath()));
|
||||
ModelFile inner = models().getExistingFile(prefix("block/stairs/" + b.getRegistryName().getPath() + "_inner"));
|
||||
ModelFile outer = models().getExistingFile(prefix("block/stairs/" + b.getRegistryName().getPath() + "_outer"));
|
||||
String name = b.getRegistryName().getPath();
|
||||
if (name.contains("quartz") && b instanceof RotatedPillarBlock) {
|
||||
ModelFile file = models().getExistingFile(prefix("block/" + name));
|
||||
getVariantBuilder(b)
|
||||
.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 SlabBlock) {
|
||||
ModelFile file = models().getExistingFile(prefix("block/" + name));
|
||||
ModelFile fullFile = models().getExistingFile(prefix("block/" + name.substring(0, name.length() - LibBlockNames.SLAB_SUFFIX.length())));
|
||||
getVariantBuilder(b)
|
||||
.partialState().with(SlabBlock.TYPE, SlabType.BOTTOM).setModels(new ConfiguredModel(file))
|
||||
.partialState().with(SlabBlock.TYPE, SlabType.TOP).setModels(new ConfiguredModel(file, 180, 0, true))
|
||||
.partialState().with(SlabBlock.TYPE, SlabType.DOUBLE).setModels(new ConfiguredModel(fullFile));
|
||||
} else if (b instanceof StairsBlock) {
|
||||
ModelFile stair = models().getExistingFile(prefix("block/stairs/" + name));
|
||||
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 BlockAltGrass) {
|
||||
ModelFile model = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath()));
|
||||
ModelFile model = models().getExistingFile(prefix("block/" + name));
|
||||
getVariantBuilder(b).partialState().setModels(new ConfiguredModel(model),
|
||||
new ConfiguredModel(model, 0, 90, false),
|
||||
new ConfiguredModel(model, 0, 180, false),
|
||||
@@ -75,16 +93,16 @@ public class BlockstateProvider extends BlockStateProvider {
|
||||
getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file));
|
||||
} else if (b == ModBlocks.elfGlass) {
|
||||
ConfiguredModel[] files = IntStream.rangeClosed(0, 3)
|
||||
.mapToObj(i -> models().getExistingFile(prefix("block/" + b.getRegistryName().getPath() + "_" + i)))
|
||||
.mapToObj(i -> models().getExistingFile(prefix("block/" + name + "_" + i)))
|
||||
.map(ConfiguredModel::new).toArray(ConfiguredModel[]::new);
|
||||
getVariantBuilder(b).partialState().setModels(files);
|
||||
} else if (b == ModBlocks.enderEye || b == ModBlocks.manaDetector) {
|
||||
ModelFile offFile = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath()));
|
||||
ModelFile onFile = models().getExistingFile(prefix("block/" + b.getRegistryName().getPath() + "_powered"));
|
||||
ModelFile offFile = models().getExistingFile(prefix("block/" + name));
|
||||
ModelFile onFile = models().getExistingFile(prefix("block/" + name + "_powered"));
|
||||
getVariantBuilder(b).partialState().with(BotaniaStateProps.POWERED, false).setModels(new ConfiguredModel(offFile));
|
||||
getVariantBuilder(b).partialState().with(BotaniaStateProps.POWERED, true).setModels(new ConfiguredModel(onFile));
|
||||
} else {
|
||||
simpleBlock(b, models().getExistingFile(prefix("block/" + b.getRegistryName().getPath())));
|
||||
simpleBlock(b, models().getExistingFile(prefix("block/" + name)));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user