Rename specialflower textures and generate their block/item models

This commit is contained in:
Vincent Lee committed 2020-06-29 22:33:10 -05:00
1 parent 7da5552cc1
commit 48c4cad2b5
245 files changed
+587 -575

No files matched your search

@@ -26,6 +26,7 @@ import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder;
import vazkii.botania.common.block.BlockAltGrass;
import vazkii.botania.common.block.BlockSpecialFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.BlockPetalBlock;
import vazkii.botania.common.block.string.BlockRedString;
@@ -60,7 +61,11 @@ public class BlockstateProvider extends BlockStateProvider {
}
String name = Registry.BLOCK.getKey(b).getPath();
if (name.contains("quartz") && b instanceof RotatedPillarBlock) {
if (b instanceof BlockSpecialFlower) {
ModelFile model = models().withExistingParent(name, prefix("block/shapes/cross"))
.texture("cross", prefix("block/" + name));
simpleBlock(b, model);
} else 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))
@@ -8,11 +8,13 @@
*/
package vazkii.botania.data;
import net.minecraft.block.Block;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.BlockItem;
import net.minecraft.util.registry.Registry;
import net.minecraftforge.client.model.generators.ExistingFileHelper;
import vazkii.botania.common.block.BlockSpecialFlower;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.lib.LibMisc;
@@ -30,9 +32,14 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
Registry.ITEM.stream().filter(i -> LibMisc.MOD_ID.equals(Registry.ITEM.getKey(i).getNamespace()))
.forEach(i -> {
// todo 1.15 expand to all item models that simply reference their parent
if (i instanceof BlockItem && ((BlockItem) i).getBlock() instanceof BlockFloatingFlower) {
if (i instanceof BlockItem) {
Block b = ((BlockItem) i).getBlock();
String name = Registry.ITEM.getKey(i).getPath();
withExistingParent(name, prefix("block/" + name));
if (b instanceof BlockSpecialFlower) {
withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name));
} else if (b instanceof BlockFloatingFlower) {
withExistingParent(name, prefix("block/" + name));
}
}
});
}