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

@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/agricarnation"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/agricarnation_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/bellethorn"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/bellethorn_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/bergamute"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/flower_func_bubbell"
"cross": "botania:block/bubbell"
}
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/bubbell_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/clayconia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/clayconia_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/daffomill"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/dandelifeon"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/dreadthorn"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/endoflame"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/entropinnyum"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/exoflame"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/fallen_kanade"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/gourmaryllis"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/heisei_dream"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/hopperhock"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/hopperhock_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/hyacidus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/hydroangeas"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/jaded_amaranthus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/jiyuulia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/kekimurus"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/flower_func_loonium"
"cross": "botania:block/loonium"
}
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/manastar"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/marimorphosis"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/marimorphosis_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/medumone"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/flower_gen_munchdew"
"cross": "botania:block/munchdew"
}
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/narslimmus"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/flower_func_orechid"
"cross": "botania:block/orechid"
}
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/orechid_ignem"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/pollidisiac"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/pure_daisy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/rafflowsia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/rannuncarpus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/rannuncarpus_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/rosa_arcana"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/shulk_me_not"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/solegnolia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/solegnolia_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/spectranthemum"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/spectrolus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/tangleberrie"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/thermalily"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/tigerseye"
}
}
@@ -0,0 +1,6 @@
{
"parent": "botania:block/shapes/cross",
"textures": {
"cross": "botania:block/vinculotus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/agricarnation"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/agricarnation_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/bellethorn"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/bellethorn_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/bergamute"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/bubbell"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/bubbell_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/clayconia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/clayconia_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/daffomill"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/dandelifeon"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/dreadthorn"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/endoflame"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/entropinnyum"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/exoflame"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/fallen_kanade"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/gourmaryllis"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/heisei_dream"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/hopperhock"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/hopperhock_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/hyacidus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/hydroangeas"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/jaded_amaranthus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/jiyuulia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/kekimurus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/loonium"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/manastar"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/marimorphosis"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/marimorphosis_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/medumone"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/munchdew"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/narslimmus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/orechid"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/orechid_ignem"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/pollidisiac"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/pure_daisy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/rafflowsia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/rannuncarpus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/rannuncarpus_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/rosa_arcana"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/shulk_me_not"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/solegnolia"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/solegnolia_chibi"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/spectranthemum"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/spectrolus"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/tangleberrie"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/thermalily"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/tigerseye"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:block/vinculotus"
}
}
@@ -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));
}
}
});
}
Loaded 100 of 245 files, more files were not shown because too many files have changed in this diff. Show more