diff --git a/MC18_notes.txt b/MC18_notes.txt index 33bb81bd5..ca56cc4a4 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -28,4 +28,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is - Sub to texture stitch and bake our own model there to use? - This remains the largest portion of what is left - Where is the method to render an arbitrary baked model? -* CRITICAL: All blockstates are done, but they appear to not be registered correctly (always have default variant)... is it the itemblock's fault?? \ No newline at end of file +* ItemBlocks seem to merge subtypes (shift clicking storage blocks onto each other) \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java new file mode 100644 index 000000000..a010a4c6c --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -0,0 +1,148 @@ +package vazkii.botania.client.core.handler; + +import com.google.common.collect.ImmutableList; +import net.minecraft.block.Block; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.BlockWall; +import net.minecraft.client.renderer.block.statemap.StateMap; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.block.decor.slabs.BlockModSlab; + +import java.util.List; + +public final class ModelHandler { + + // Very hardocode-y right now. Will be refactored after things work. + // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). + // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files + public static void registerModels() { + /** Custom statemappers **/ + registerStateMappers(); + + /** ItemBlocks **/ + registerStorageItemBlocks(); + registerMushroomItemBlocks(); + registerFlowerItemBlocks(); + /** Normal Items **/ + + /** Special Item Meshers **/ + } + + private static void registerStateMappers() { + // Ignore vanilla variant in flowers + ModelLoader.setCustomStateMapper(ModBlocks.flower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.flower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.shinyFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.shinyFlower).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.buriedPetals, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.buriedPetals).getTypeProperty()).build()); + ModelLoader.setCustomStateMapper(ModBlocks.specialFlower, (new StateMap.Builder()).ignore(((BlockFlower) ModBlocks.specialFlower).getTypeProperty()).build()); + + // Ignore vanilla variant in walls + ModelLoader.setCustomStateMapper(ModFluffBlocks.biomeStoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.dreamwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingrockWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.livingwoodWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.prismarineWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.reedWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + ModelLoader.setCustomStateMapper(ModFluffBlocks.stoneWall, (new StateMap.Builder()).ignore(BlockWall.VARIANT).build()); + + // Ignore dummy variant in slabs + for (Block b : ModFluffBlocks.biomeStoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + for (Block b : ModFluffBlocks.pavementSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + for (Block b : ModFluffBlocks.stoneSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + List otherSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlab, ModFluffBlocks.livingrockSlab, ModFluffBlocks.dreamwoodSlab, ModFluffBlocks.livingrockBrickSlab, + ModFluffBlocks.dreamwoodPlankSlab, ModFluffBlocks.prismarineSlab, ModFluffBlocks.prismarineBrickSlab, ModFluffBlocks.darkPrismarineSlab, + ModFluffBlocks.reedSlab, ModFluffBlocks.thatchSlab, ModFluffBlocks.netherBrickSlab, ModFluffBlocks.soulBrickSlab, ModFluffBlocks.snowBrickSlab, + ModFluffBlocks.tileSlab, ModFluffBlocks.darkQuartzSlab, ModFluffBlocks.manaQuartzSlab, ModFluffBlocks.blazeQuartzSlab, + ModFluffBlocks.lavenderQuartzSlab, ModFluffBlocks.redQuartzSlab, ModFluffBlocks.elfQuartzSlab, ModFluffBlocks.sunnyQuartzSlab + }); + + for (Block b : otherSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY).build()); + } + + // Ignore both dummy variant and half prop in full slabs + for (Block b : ModFluffBlocks.biomeStoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + + for (Block b : ModFluffBlocks.pavementFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + + for (Block b : ModFluffBlocks.stoneFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + + List otherFullSlabs = ImmutableList.copyOf(new Block[] { + ModFluffBlocks.livingwoodSlabFull, ModFluffBlocks.livingrockSlabFull, ModFluffBlocks.dreamwoodSlabFull, ModFluffBlocks.livingrockBrickSlabFull, + ModFluffBlocks.dreamwoodPlankSlabFull, ModFluffBlocks.prismarineSlabFull, ModFluffBlocks.prismarineBrickSlabFull, ModFluffBlocks.darkPrismarineSlabFull, + ModFluffBlocks.reedSlabFull, ModFluffBlocks.thatchSlabFull, ModFluffBlocks.netherBrickSlabFull, ModFluffBlocks.soulBrickSlabFull, ModFluffBlocks.snowBrickSlabFull, + ModFluffBlocks.tileSlabFull, ModFluffBlocks.darkQuartzSlabFull, ModFluffBlocks.manaQuartzSlabFull, ModFluffBlocks.blazeQuartzSlabFull, + ModFluffBlocks.lavenderQuartzSlabFull, ModFluffBlocks.redQuartzSlabFull, ModFluffBlocks.elfQuartzSlabFull, ModFluffBlocks.sunnyQuartzSlabFull + }); + + for (Block b : otherFullSlabs) { + ModelLoader.setCustomStateMapper(b, (new StateMap.Builder()).ignore(BlockModSlab.DUMMY, BlockSlab.HALF).build()); + } + } + + private static void registerStorageItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.storage); + for (StorageVariant variant : StorageVariant.values()) { + String name = "botania:" + variant.getName() + "_block"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerMushroomItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.mushroom); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:" + color.getName() + "_mushroom"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerFlowerItemBlocks() { + Item item = Item.getItemFromBlock(ModBlocks.flower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:" + color.getName() + "_flower"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + + item = Item.getItemFromBlock(ModBlocks.shinyFlower); + for (EnumDyeColor color : EnumDyeColor.values()) { + String name = "botania:" + color.getName() + "_shinyFlower"; + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + } + } + + private static void registerItemModel(Item i) { + ResourceLocation loc = GameData.getItemRegistry().getNameForObject(i); + ModelLoader.setCustomModelResourceLocation(i, 0, new ModelResourceLocation(loc, "inventory")); + } + + private ModelHandler() {} +} diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 422a17bc6..e451cfd93 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -51,6 +51,7 @@ import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; @@ -178,6 +179,8 @@ public class ClientProxy extends CommonProxy { } super.preInit(event); + + ModelHandler.registerModels(); } @Override diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 2b6391857..584d12181 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -12,7 +12,7 @@ package vazkii.botania.client.lib; public final class LibResources { - public static final String PREFIX_MOD = "botania:"; // todo 1.8 take out the colon? + public static final String PREFIX_MOD = "botania:"; public static final String PREFIX_LANG = "/assets/botania/lang/"; public static final String PREFIX_SHADER = "/assets/botania/shader/"; diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 3e5af8e12..f5e4b4271 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -108,11 +108,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup return super.setLightLevel(p_149715_1_); } - @Override - public int getRenderType() { - return LibRenderIDs.idSpecialFlower; - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index a6ee70be3..3f261bc5d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -28,7 +28,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; protected final boolean doubleSlab; - public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); // todo 1.8.8 statemapper ignore this prop for everything + public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { super(mat); @@ -39,22 +39,30 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } - setDefaultState(blockState.getBaseState().withProperty(DUMMY, DummyEnum.SINGLETON)); + setDefaultState(blockState.getBaseState().withProperty(HALF, EnumBlockHalf.BOTTOM).withProperty(DUMMY, DummyEnum.SINGLETON)); } @Override public BlockState createBlockState() { - return new BlockState(this, getVariantProperty()); + return new BlockState(this, HALF, getVariantProperty()); } @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState(); + if (doubleSlab) { + return getDefaultState(); + } else { + return getDefaultState().withProperty(HALF, meta == 8 ? EnumBlockHalf.TOP : EnumBlockHalf.BOTTOM); + } } @Override public int getMetaFromState(IBlockState state) { - return 0; + if (doubleSlab) { + return 0; + } else { + return state.getValue(HALF) == EnumBlockHalf.TOP ? 8 : 0; + } } public abstract BlockSlab getFullBlock(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 4365d5a24..630c88b1b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -25,6 +25,7 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc public ItemBlockWithMetadataAndName(Block par2Block) { super(par2Block); + setHasSubtypes(true); } @Override @@ -47,4 +48,10 @@ public class ItemBlockWithMetadataAndName extends ItemBlock implements IPickupAc return block instanceof IPickupAchievement ? ((IPickupAchievement) block).getAchievementOnPickup(stack, player, item) : null; } + @Override + public int getMetadata(int damage) + { + return damage; + } + } diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json new file mode 100644 index 000000000..645d917ac --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -0,0 +1,71 @@ +{ + "forge_marker": 1, + "variants": { + "color": { + "white": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower0" } + }, + "orange": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower1" } + }, + "magenta": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower2" } + }, + "light_blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower3" } + }, + "yellow": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower4" } + }, + "lime": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower5" } + }, + "pink": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower6" } + }, + "gray": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower7" } + }, + "silver": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower8" } + }, + "cyan": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower9" } + }, + "purple": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower10" } + }, + "blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower11" } + }, + "brown": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower12" } + }, + "green": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower13" } + }, + "red": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower14" } + }, + "black": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flower15" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json new file mode 100644 index 000000000..bdd1fc07a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -0,0 +1,71 @@ +{ + "forge_marker": 1, + "variants": { + "color": { + "white": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom0" } + }, + "orange": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom1" } + }, + "magenta": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom2" } + }, + "light_blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom3" } + }, + "yellow": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom4" } + }, + "lime": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom5" } + }, + "pink": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom6" } + }, + "gray": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom7" } + }, + "silver": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom8" } + }, + "cyan": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom9" } + }, + "purple": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom10" } + }, + "blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom11" } + }, + "brown": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom12" } + }, + "green": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom13" } + }, + "red": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom14" } + }, + "black": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/mushroom15" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json new file mode 100644 index 000000000..fd3edfa27 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -0,0 +1,71 @@ +{ + "forge_marker": 1, + "variants": { + "color": { + "white": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering0" } + }, + "orange": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering1" } + }, + "magenta": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering2" } + }, + "light_blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering3" } + }, + "yellow": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering4" } + }, + "lime": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering5" } + }, + "pink": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering6" } + }, + "gray": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering7" } + }, + "silver": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering8" } + }, + "cyan": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering9" } + }, + "purple": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering10" } + }, + "blue": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering11" } + }, + "brown": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering12" } + }, + "green": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering13" } + }, + "red": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering14" } + }, + "black": { + "model": "minecraft:cross", + "textures": { "cross": "botania:blocks/flowerGlimmering15" } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/storage.json b/src/main/resources/assets/botania/blockstates/storage.json new file mode 100644 index 000000000..416692109 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/storage.json @@ -0,0 +1,9 @@ +{ + "variants": { + "variant=manasteel": { "model": "botania:manasteel_block" }, + "variant=terrasteel": { "model": "botania:terrasteel_block" }, + "variant=elementium": { "model": "botania:elementium_block" }, + "variant=mana_diamond": { "model": "botania:mana_diamond_block" }, + "variant=dragonstone": { "model": "botania:dragonstone_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dragonstone_block.json b/src/main/resources/assets/botania/models/block/dragonstone_block.json new file mode 100644 index 000000000..7d0c130d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dragonstone_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elementium_block.json b/src/main/resources/assets/botania/models/block/elementium_block.json new file mode 100644 index 000000000..a55282f38 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elementium_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_diamond_block.json b/src/main/resources/assets/botania/models/block/mana_diamond_block.json new file mode 100644 index 000000000..4a875189b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/mana_diamond_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manasteel_block.json b/src/main/resources/assets/botania/models/block/manasteel_block.json new file mode 100644 index 000000000..bdb8f0a68 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terrasteel_block.json b/src/main/resources/assets/botania/models/block/terrasteel_block.json new file mode 100644 index 000000000..add746c6d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/terrasteel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/storage1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_flower.json b/src/main/resources/assets/botania/models/item/black_flower.json new file mode 100644 index 000000000..74be17232 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_mushroom.json b/src/main/resources/assets/botania/models/item/black_mushroom.json new file mode 100644 index 000000000..02010cbda --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/black_shinyFlower.json b/src/main/resources/assets/botania/models/item/black_shinyFlower.json new file mode 100644 index 000000000..9e32d4ab4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_flower.json b/src/main/resources/assets/botania/models/item/blue_flower.json new file mode 100644 index 000000000..08989cd7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_mushroom.json b/src/main/resources/assets/botania/models/item/blue_mushroom.json new file mode 100644 index 000000000..0301bf3fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blue_shinyFlower.json b/src/main/resources/assets/botania/models/item/blue_shinyFlower.json new file mode 100644 index 000000000..584a504b3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_flower.json b/src/main/resources/assets/botania/models/item/brown_flower.json new file mode 100644 index 000000000..73c83d12c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_mushroom.json b/src/main/resources/assets/botania/models/item/brown_mushroom.json new file mode 100644 index 000000000..39e744fee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brown_shinyFlower.json b/src/main/resources/assets/botania/models/item/brown_shinyFlower.json new file mode 100644 index 000000000..babb9d96a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_flower.json b/src/main/resources/assets/botania/models/item/cyan_flower.json new file mode 100644 index 000000000..ff1f1f9ec --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_mushroom.json b/src/main/resources/assets/botania/models/item/cyan_mushroom.json new file mode 100644 index 000000000..d17557e19 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json b/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json new file mode 100644 index 000000000..23cfb282b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dragonstone_block.json b/src/main/resources/assets/botania/models/item/dragonstone_block.json new file mode 100644 index 000000000..a21a57746 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dragonstone_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/dragonstone_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementium_block.json b/src/main/resources/assets/botania/models/item/elementium_block.json new file mode 100644 index 000000000..5b8856070 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementium_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/elementium_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_flower.json b/src/main/resources/assets/botania/models/item/gray_flower.json new file mode 100644 index 000000000..cff1cd61b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_mushroom.json b/src/main/resources/assets/botania/models/item/gray_mushroom.json new file mode 100644 index 000000000..ba46fa3b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gray_shinyFlower.json b/src/main/resources/assets/botania/models/item/gray_shinyFlower.json new file mode 100644 index 000000000..0bacb5d9b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_flower.json b/src/main/resources/assets/botania/models/item/green_flower.json new file mode 100644 index 000000000..e4aedca11 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_mushroom.json b/src/main/resources/assets/botania/models/item/green_mushroom.json new file mode 100644 index 000000000..aed8cc9ab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/green_shinyFlower.json b/src/main/resources/assets/botania/models/item/green_shinyFlower.json new file mode 100644 index 000000000..eb8516159 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_flower.json b/src/main/resources/assets/botania/models/item/light_blue_flower.json new file mode 100644 index 000000000..0ff9e7bd0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_mushroom.json b/src/main/resources/assets/botania/models/item/light_blue_mushroom.json new file mode 100644 index 000000000..02569057b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json b/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json new file mode 100644 index 000000000..65e9a89c0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_flower.json b/src/main/resources/assets/botania/models/item/lime_flower.json new file mode 100644 index 000000000..16d27ccd3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_mushroom.json b/src/main/resources/assets/botania/models/item/lime_mushroom.json new file mode 100644 index 000000000..60e3fd100 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lime_shinyFlower.json b/src/main/resources/assets/botania/models/item/lime_shinyFlower.json new file mode 100644 index 000000000..3b6026e2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_flower.json b/src/main/resources/assets/botania/models/item/magenta_flower.json new file mode 100644 index 000000000..4018d6d6e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_mushroom.json b/src/main/resources/assets/botania/models/item/magenta_mushroom.json new file mode 100644 index 000000000..617ad89ee --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json b/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json new file mode 100644 index 000000000..111119d77 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/mana_diamond_block.json b/src/main/resources/assets/botania/models/item/mana_diamond_block.json new file mode 100644 index 000000000..38382bf2f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/mana_diamond_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/mana_diamond_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteel_block.json b/src/main/resources/assets/botania/models/item/manasteel_block.json new file mode 100644 index 000000000..b34dfb7c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteel_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/manasteel_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_flower.json b/src/main/resources/assets/botania/models/item/orange_flower.json new file mode 100644 index 000000000..117a1ae96 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_mushroom.json b/src/main/resources/assets/botania/models/item/orange_mushroom.json new file mode 100644 index 000000000..6e0e78438 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/orange_shinyFlower.json b/src/main/resources/assets/botania/models/item/orange_shinyFlower.json new file mode 100644 index 000000000..e1354029b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_flower.json b/src/main/resources/assets/botania/models/item/pink_flower.json new file mode 100644 index 000000000..97aab6cfb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_mushroom.json b/src/main/resources/assets/botania/models/item/pink_mushroom.json new file mode 100644 index 000000000..562925c0b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pink_shinyFlower.json b/src/main/resources/assets/botania/models/item/pink_shinyFlower.json new file mode 100644 index 000000000..4d1005a14 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_flower.json b/src/main/resources/assets/botania/models/item/purple_flower.json new file mode 100644 index 000000000..422e008de --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_mushroom.json b/src/main/resources/assets/botania/models/item/purple_mushroom.json new file mode 100644 index 000000000..d7874c8ba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/purple_shinyFlower.json b/src/main/resources/assets/botania/models/item/purple_shinyFlower.json new file mode 100644 index 000000000..fbc39c447 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_flower.json b/src/main/resources/assets/botania/models/item/red_flower.json new file mode 100644 index 000000000..71adb35b7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_mushroom.json b/src/main/resources/assets/botania/models/item/red_mushroom.json new file mode 100644 index 000000000..43d756c6a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/red_shinyFlower.json b/src/main/resources/assets/botania/models/item/red_shinyFlower.json new file mode 100644 index 000000000..b03af685f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/silver_flower.json b/src/main/resources/assets/botania/models/item/silver_flower.json new file mode 100644 index 000000000..e7e1a7bad --- /dev/null +++ b/src/main/resources/assets/botania/models/item/silver_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/silver_mushroom.json b/src/main/resources/assets/botania/models/item/silver_mushroom.json new file mode 100644 index 000000000..edb1409dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/silver_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/silver_shinyFlower.json b/src/main/resources/assets/botania/models/item/silver_shinyFlower.json new file mode 100644 index 000000000..0bacb5d9b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/silver_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/standard_item.json b/src/main/resources/assets/botania/models/item/standard_item.json new file mode 100644 index 000000000..25cf45f1e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/standard_item.json @@ -0,0 +1,15 @@ +{ + "parent": "builtin/generated", + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/standard_tool.json b/src/main/resources/assets/botania/models/item/standard_tool.json new file mode 100644 index 000000000..835adad2c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/standard_tool.json @@ -0,0 +1,15 @@ +{ + "parent": "builtin/generated", + "display": { + "thirdperson": { + "rotation": [ 0, 90, -35 ], + "translation": [ 0, 1.25, -3.5 ], + "scale": [ 0.85, 0.85, 0.85 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteel_block.json b/src/main/resources/assets/botania/models/item/terrasteel_block.json new file mode 100644 index 000000000..a1295c1bc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteel_block.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/terrasteel_block", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_flower.json b/src/main/resources/assets/botania/models/item/white_flower.json new file mode 100644 index 000000000..c72fbabed --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_mushroom.json b/src/main/resources/assets/botania/models/item/white_mushroom.json new file mode 100644 index 000000000..4f6d7d848 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/white_shinyFlower.json b/src/main/resources/assets/botania/models/item/white_shinyFlower.json new file mode 100644 index 000000000..e80b16af8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_flower.json b/src/main/resources/assets/botania/models/item/yellow_flower.json new file mode 100644 index 000000000..1fd5e7d07 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flower4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_mushroom.json b/src/main/resources/assets/botania/models/item/yellow_mushroom.json new file mode 100644 index 000000000..7c1555c74 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/mushroom4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json b/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json new file mode 100644 index 000000000..ff3082d61 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_shinyFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:blocks/flowerGlimmering4" + } +} \ No newline at end of file