From 5fe696875f05623f6f35c68bb2552851cb977335 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 26 Dec 2015 16:21:21 -0600 Subject: [PATCH] More various models --- .../client/core/handler/ModelHandler.java | 55 +++++++++++++++++++ .../botania/common/block/BlockBifrost.java | 5 +- .../common/block/BlockBifrostPerm.java | 4 +- .../botania/common/block/BlockEnderEye.java | 2 +- .../botania/common/block/BlockFakeAir.java | 5 ++ .../common/block/BlockModContainer.java | 5 ++ .../common/block/decor/BlockManaBeacon.java | 5 -- .../common/block/decor/BlockStarfield.java | 5 -- .../common/block/mana/BlockRuneAltar.java | 5 -- .../common/block/mana/BlockSpawnerClaw.java | 2 +- .../common/block/mana/BlockSpreader.java | 2 +- .../equipment/tool/bow/ItemCrystalBow.java | 29 ++++++++++ .../equipment/tool/bow/ItemLivingwoodBow.java | 38 +++++++------ .../assets/botania/blockstates/bifrost.json | 15 +++++ .../botania/blockstates/bifrostPerm.json | 15 +++++ .../botania/blockstates/blazeBlock.json | 14 +++++ .../assets/botania/blockstates/dirtPath.json | 3 +- .../botania/blockstates/enderEyeBlock.json | 19 +++++++ .../assets/botania/blockstates/forestEye.json | 19 +++++++ .../botania/blockstates/manaBeacon.json | 9 ++- .../assets/botania/blockstates/openCrate.json | 23 ++++++++ .../assets/botania/blockstates/thatch.json | 14 +++++ .../botania/blockstates/tinyPlanetBlock.json | 14 +++++ .../botania/blockstates/unstableBlock.json | 9 ++- .../botania/models/block/microblock.json | 20 +++++++ ...ck_all.json => microblock_all_tinted.json} | 0 .../botania/models/block/miniblock_all.json | 20 +++++++ .../models/block/miniblock_all_tinted.json | 20 +++++++ ...ock_top.json => miniblock_top_tinted.json} | 0 .../botania/models/item/crystalBow.json | 18 ++++++ .../models/item/crystalBow_pulling_1.json | 18 ++++++ .../models/item/crystalBow_pulling_2.json | 18 ++++++ .../models/item/crystalBow_pulling_3.json | 18 ++++++ .../models/item/crystalBow_pulling_4.json | 18 ++++++ .../models/item/crystalBow_pulling_5.json | 18 ++++++ .../assets/botania/models/item/dye.json | 6 ++ .../botania/models/item/fertilizer.json | 6 ++ .../assets/botania/models/item/flowerBag.json | 6 ++ .../botania/models/item/livingwoodBow.json | 18 ++++++ .../models/item/livingwoodBow_pulling_1.json | 18 ++++++ .../models/item/livingwoodBow_pulling_2.json | 18 ++++++ .../models/item/livingwoodBow_pulling_3.json | 18 ++++++ .../botania/models/item/obedienceStick.json | 6 ++ .../assets/botania/models/item/petal.json | 6 ++ .../assets/botania/models/item/rune_air.json | 6 ++ .../botania/models/item/rune_autumn.json | 6 ++ .../botania/models/item/rune_earth.json | 6 ++ .../assets/botania/models/item/rune_envy.json | 6 ++ .../assets/botania/models/item/rune_fire.json | 6 ++ .../botania/models/item/rune_gluttony.json | 6 ++ .../botania/models/item/rune_greed.json | 6 ++ .../assets/botania/models/item/rune_lust.json | 6 ++ .../assets/botania/models/item/rune_mana.json | 6 ++ .../botania/models/item/rune_pride.json | 6 ++ .../botania/models/item/rune_sloth.json | 6 ++ .../botania/models/item/rune_spring.json | 6 ++ .../botania/models/item/rune_summer.json | 6 ++ .../botania/models/item/rune_water.json | 6 ++ .../botania/models/item/rune_winter.json | 6 ++ .../botania/models/item/rune_wrath.json | 6 ++ 60 files changed, 633 insertions(+), 49 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/bifrost.json create mode 100644 src/main/resources/assets/botania/blockstates/bifrostPerm.json create mode 100644 src/main/resources/assets/botania/blockstates/blazeBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/enderEyeBlock.json create mode 100644 src/main/resources/assets/botania/blockstates/forestEye.json create mode 100644 src/main/resources/assets/botania/blockstates/openCrate.json create mode 100644 src/main/resources/assets/botania/blockstates/thatch.json create mode 100644 src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json create mode 100644 src/main/resources/assets/botania/models/block/microblock.json rename src/main/resources/assets/botania/models/block/{microblock_all.json => microblock_all_tinted.json} (100%) create mode 100644 src/main/resources/assets/botania/models/block/miniblock_all.json create mode 100644 src/main/resources/assets/botania/models/block/miniblock_all_tinted.json rename src/main/resources/assets/botania/models/block/{miniblock_top.json => miniblock_top_tinted.json} (100%) create mode 100644 src/main/resources/assets/botania/models/item/crystalBow.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json create mode 100644 src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json create mode 100644 src/main/resources/assets/botania/models/item/dye.json create mode 100644 src/main/resources/assets/botania/models/item/fertilizer.json create mode 100644 src/main/resources/assets/botania/models/item/flowerBag.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json create mode 100644 src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json create mode 100644 src/main/resources/assets/botania/models/item/obedienceStick.json create mode 100644 src/main/resources/assets/botania/models/item/petal.json create mode 100644 src/main/resources/assets/botania/models/item/rune_air.json create mode 100644 src/main/resources/assets/botania/models/item/rune_autumn.json create mode 100644 src/main/resources/assets/botania/models/item/rune_earth.json create mode 100644 src/main/resources/assets/botania/models/item/rune_envy.json create mode 100644 src/main/resources/assets/botania/models/item/rune_fire.json create mode 100644 src/main/resources/assets/botania/models/item/rune_gluttony.json create mode 100644 src/main/resources/assets/botania/models/item/rune_greed.json create mode 100644 src/main/resources/assets/botania/models/item/rune_lust.json create mode 100644 src/main/resources/assets/botania/models/item/rune_mana.json create mode 100644 src/main/resources/assets/botania/models/item/rune_pride.json create mode 100644 src/main/resources/assets/botania/models/item/rune_sloth.json create mode 100644 src/main/resources/assets/botania/models/item/rune_spring.json create mode 100644 src/main/resources/assets/botania/models/item/rune_summer.json create mode 100644 src/main/resources/assets/botania/models/item/rune_water.json create mode 100644 src/main/resources/assets/botania/models/item/rune_winter.json create mode 100644 src/main/resources/assets/botania/models/item/rune_wrath.json diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index b027bc2f3..2e66a3f2a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -23,6 +23,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.DrumVariant; import vazkii.botania.api.state.enums.EndBrickVariant; import vazkii.botania.api.state.enums.FutureStoneVariant; @@ -114,6 +115,9 @@ public final class ModelHandler { /** Normal Items **/ registerStandardItems(); registerManaResources(); + registerDyesPetals(); + registerRunes(); + registerBows(); /** Special Item Meshers **/ } @@ -193,6 +197,13 @@ public final class ModelHandler { registerItemModel(ModBlocks.alchemyCatalyst); registerItemModel(ModBlocks.conjurationCatalyst); registerItemModel(ModBlocks.reedBlock); + registerItemModel(ModBlocks.bifrost); + registerItemModel(ModBlocks.bifrostPerm); + registerItemModel(ModBlocks.enderEye); + registerItemModel(ModBlocks.tinyPlanet); + registerItemModel(ModBlocks.thatch); + registerItemModel(ModBlocks.blazeBlock); + registerItemModel(ModBlocks.forestEye); // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); @@ -206,6 +217,7 @@ public final class ModelHandler { registerVariantsDefaulted(ModFluffBlocks.biomeStoneA, BiomeStoneVariant.class, "variant"); registerVariantsDefaulted(ModFluffBlocks.biomeStoneB, BiomeBrickVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.endStoneBrick, EndBrickVariant.class, "variant"); + registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant"); } private static void registerStandardItems() { @@ -251,6 +263,9 @@ public final class ModelHandler { registerItemModel(thunderSword); registerItemModel(glassPick); registerItemModel(twigWand); + registerItemModel(flowerBag); + registerItemModel(fertilizer); + registerItemModel(obedienceStick); } private static void registerManaResources() { @@ -262,6 +277,46 @@ public final class ModelHandler { } } + private static void registerDyesPetals() { + Item item = dye; + String name = GameData.getItemRegistry().getNameForObject(item).toString(); + + Item item2 = petal; + String name2 = GameData.getItemRegistry().getNameForObject(item2).toString(); + + for (EnumDyeColor color : EnumDyeColor.values()) { + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, "inventory")); + ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); + + ModelLoader.registerItemVariants(item2, new ModelResourceLocation(name2, "inventory")); + ModelLoader.setCustomModelResourceLocation(item2, color.getMetadata(), new ModelResourceLocation(name2, "inventory")); + } + } + + private static void registerRunes() { + List variantNames = ImmutableList.of("water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride"); + for (int i = 0; i < variantNames.size(); i++) { + ModelLoader.registerItemVariants(rune, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); + ModelLoader.setCustomModelResourceLocation(rune, i, new ModelResourceLocation("botania:rune_" + variantNames.get(i), "inventory")); + } + } + + private static void registerBows() { + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow", "inventory")); + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_1", "inventory")); + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_2", "inventory")); + ModelLoader.registerItemVariants(livingwoodBow, new ModelResourceLocation("botania:livingwoodBow_pulling_3", "inventory")); + registerItemModel(livingwoodBow); + + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_1", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_2", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_3", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_4", "inventory")); + ModelLoader.registerItemVariants(crystalBow, new ModelResourceLocation("botania:crystalBow_pulling_5", "inventory")); + registerItemModel(crystalBow); + } + private static void registerStateMappers() { // Ignore vanilla facing, variant in double flower ModelLoader.setCustomStateMapper(ModBlocks.doubleFlower1, (new StateMap.Builder()).ignore(BlockDoublePlant.VARIANT, BlockDoublePlant.field_181084_N).build()); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index ec0ed2519..c055ba4b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -32,6 +32,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; @@ -72,12 +73,12 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); //todo 1.8 verify + return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); } @Override public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 + return EnumWorldBlockLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index f8d92c744..c16e8df54 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -53,7 +53,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, BlockPos pos, EnumFacing side) { - return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); //todo 1.8 verify + return shouldSideBeRendered1(p_149646_1_, pos, side.getOpposite()); } @Override @@ -64,7 +64,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @Override public EnumWorldBlockLayer getBlockLayer() { - return EnumWorldBlockLayer.CUTOUT_MIPPED; // todo 1.8 verify + return EnumWorldBlockLayer.TRANSLUCENT; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 3c417f4c7..bcb903910 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -60,7 +60,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { @Override public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side) { - return state.getValue(BotaniaStateProps.POWER); + return state.getValue(BotaniaStateProps.POWERED) ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 6e8856513..f2bcec8a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -38,6 +38,11 @@ public class BlockFakeAir extends BlockModContainer { setTickRandomly(true); } + @Override + public int getRenderType() { + return -1; + } + @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block block) { if(shouldRemove(world, pos)) diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index 328f69219..5480eb915 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -32,6 +32,11 @@ public abstract class BlockModContainer extends BlockConta setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Override + public int getRenderType() { + return 3; + } + @Override public Block setUnlocalizedName(String par1Str) { if(shouldRegisterInNameSet()) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 770d17284..cf0dfb071 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -52,11 +52,6 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); } - @Override - public int getRenderType() { - return 3; - } - @Override public BlockState createBlockState() { return new BlockState(this, BotaniaStateProps.COLOR); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 3ec634b7a..16ce01c95 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -40,11 +40,6 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F); } - @Override - public int getRenderType() { - return 3; - } - @Override public EnumWorldBlockLayer getBlockLayer() { return EnumWorldBlockLayer.CUTOUT_MIPPED; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index e9b02430b..3dac4408f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -52,11 +52,6 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex random = new Random(); } - @Override - public int getRenderType() { - return 3; - } - @Override public boolean isOpaqueCube() { return false; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index d399104c4..b1b7d8c3c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -59,7 +59,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable @Override public int getRenderType() { - return LibRenderIDs.idSpawnerClaw; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 2d6b29c3f..bfebe0c69 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -143,7 +143,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public int getRenderType() { - return LibRenderIDs.idSpreader; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 541b15fd4..ee64aa7e8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -10,12 +10,16 @@ */ package vazkii.botania.common.item.equipment.tool.bow; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; @@ -49,4 +53,29 @@ public class ItemCrystalBow extends ItemLivingwoodBow { ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity ? 2 : 1), false); } + @Override + @SideOnly(Side.CLIENT) + public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { + String name = GameData.getItemRegistry().getNameForObject(this).toString(); + + if (useRemaining == 0) { + return new ModelResourceLocation(name, "inventory"); + } + + int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); + + if(j >= 28) + return new ModelResourceLocation(name + "_pulling_5", "inventory"); + if(j >= 23) + return new ModelResourceLocation(name + "_pulling_4", "inventory"); + if(j >= 18) + return new ModelResourceLocation(name + "_pulling_3", "inventory"); + if(j > 13) + return new ModelResourceLocation(name + "_pulling_2", "inventory"); + if(j > 0) + return new ModelResourceLocation(name + "_pulling_1", "inventory"); + + return new ModelResourceLocation(name, "inventory"); + } + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index b5b3a73a1..220c8bf4e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.bow; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -23,6 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; +import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -164,21 +166,25 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } -// @Override todo 1.8 -// public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { -// if(stack != usingItem) -// return itemIcon; -// -// int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); -// -// if(j >= 18) -// return pullIcons[2]; -// if(j > 13) -// return pullIcons[1]; -// if(j > 0) -// return pullIcons[0]; -// -// return itemIcon; -// } + @Override + @SideOnly(Side.CLIENT) + public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) { + String name = GameData.getItemRegistry().getNameForObject(this).toString(); + + if (useRemaining == 0) { + return new ModelResourceLocation(name, "inventory"); + } + + int j = (int) ((getMaxItemUseDuration(stack) - useRemaining) * chargeVelocityMultiplier()); + + if(j >= 18) + return new ModelResourceLocation(name + "_pulling_3", "inventory"); + if(j > 13) + return new ModelResourceLocation(name + "_pulling_2", "inventory"); + if(j > 0) + return new ModelResourceLocation(name + "_pulling_1", "inventory"); + + return new ModelResourceLocation(name, "inventory"); + } } diff --git a/src/main/resources/assets/botania/blockstates/bifrost.json b/src/main/resources/assets/botania/blockstates/bifrost.json new file mode 100644 index 000000000..e10154d99 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bifrost.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/bifrost" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/bifrostPerm.json b/src/main/resources/assets/botania/blockstates/bifrostPerm.json new file mode 100644 index 000000000..e10154d99 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bifrostPerm.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/bifrost" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/blazeBlock.json b/src/main/resources/assets/botania/blockstates/blazeBlock.json new file mode 100644 index 000000000..128196b32 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/blazeBlock.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/blazeBlock" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtPath.json index 9d7444376..46fdc670f 100644 --- a/src/main/resources/assets/botania/blockstates/dirtPath.json +++ b/src/main/resources/assets/botania/blockstates/dirtPath.json @@ -4,7 +4,8 @@ "model": "botania:minusone_all", "textures": { "all": "botania:blocks/dirtPath" - } + }, + "transform": "forge:default-block" }, "variants": { "normal": [{}], diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json new file mode 100644 index 000000000..1d55d3423 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/enderEyeBlock.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/enderEyeBlock0" + }, + "transform": "forge:default-block" + }, + "variants": { + "powered=true": [{ + "textures": { + "all": "botania:blocks/enderEyeBlock1" + } + }], + "powered=false": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/forestEye.json b/src/main/resources/assets/botania/blockstates/forestEye.json new file mode 100644 index 000000000..882a5bbc2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/forestEye.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:microblock", + "textures": { + "bottom": "botania:blocks/forestEye0", + "top": "botania:blocks/forestEye1", + "north": "botania:blocks/forestEye2", + "south": "botania:blocks/forestEye3", + "west": "botania:blocks/forestEye4", + "east": "botania:blocks/forestEye5" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manaBeacon.json index 08230c4fc..646dcd2dc 100644 --- a/src/main/resources/assets/botania/blockstates/manaBeacon.json +++ b/src/main/resources/assets/botania/blockstates/manaBeacon.json @@ -1,16 +1,15 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniblock_top", + "model": "botania:miniblock_top_tinted", "textures": { "all": "botania:blocks/manaBeacon0", "top": "botania:blocks/manaBeacon1" - } + }, + "transform": "forge:default-block" }, "variants": { "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json new file mode 100644 index 000000000..4e13284f2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/openCrate.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "transform": "forge:default-block" + }, + "variants": { + "variant=open": [{ + "textures": { + "bottom": "botania:blocks/openCrate1", + "side": "botania:blocks/openCrate0", + "top": "botania:blocks/openCrate0" + } + }], + "variant=crafty": [{ + "textures": { + "bottom": "botania:blocks/openCrate3", + "side": "botania:blocks/openCrate2", + "top": "botania:blocks/openCrate2" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/thatch.json b/src/main/resources/assets/botania/blockstates/thatch.json new file mode 100644 index 000000000..c3cf1397e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/thatch.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "botania:blocks/thatch" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json new file mode 100644 index 000000000..daec2757c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:miniblock_all", + "textures": { + "all": "botania:blocks/tinyPlanetBlock" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableBlock.json index 47a7be21f..23238ca79 100644 --- a/src/main/resources/assets/botania/blockstates/unstableBlock.json +++ b/src/main/resources/assets/botania/blockstates/unstableBlock.json @@ -1,15 +1,14 @@ { "forge_marker": 1, "defaults": { - "model": "botania:microblock_all", + "model": "botania:microblock_all_tinted", "textures": { "all": "botania:blocks/unstableBlock" - } + }, + "transform": "forge:default-block" }, "variants": { "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }] + "inventory": [{}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock.json b/src/main/resources/assets/botania/models/block/microblock.json new file mode 100644 index 000000000..e4ae95d3b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/microblock.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#top" + }, + "elements": [ + { + "name": "Cube", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "faces": { + "down": { "texture": "#top", "uv": [ 4, 4, 12, 12 ] }, + "up": { "texture": "#bottom", "uv": [ 4, 4, 12, 12 ] }, + "north": { "texture": "#north", "uv": [ 4, 4, 12, 12 ] }, + "south": { "texture": "#south", "uv": [ 4, 4, 12, 12 ] }, + "west": { "texture": "#west", "uv": [ 4, 4, 12, 12 ] }, + "east": { "texture": "#east", "uv": [ 4, 4, 12, 12 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/microblock_all.json b/src/main/resources/assets/botania/models/block/microblock_all_tinted.json similarity index 100% rename from src/main/resources/assets/botania/models/block/microblock_all.json rename to src/main/resources/assets/botania/models/block/microblock_all_tinted.json diff --git a/src/main/resources/assets/botania/models/block/miniblock_all.json b/src/main/resources/assets/botania/models/block/miniblock_all.json new file mode 100644 index 000000000..78ea55b41 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_all.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "up": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json b/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json new file mode 100644 index 000000000..cda6e04b8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniblock_all_tinted.json @@ -0,0 +1,20 @@ +{ + "textures": { + "particle": "#all" + }, + "elements": [ + { + "name": "Cube", + "from": [ 3, 3, 3 ], + "to": [ 13, 13, 13 ], + "faces": { + "down": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "up": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 }, + "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ], "tintindex": 0 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniblock_top.json b/src/main/resources/assets/botania/models/block/miniblock_top_tinted.json similarity index 100% rename from src/main/resources/assets/botania/models/block/miniblock_top.json rename to src/main/resources/assets/botania/models/block/miniblock_top_tinted.json diff --git a/src/main/resources/assets/botania/models/item/crystalBow.json b/src/main/resources/assets/botania/models/item/crystalBow.json new file mode 100644 index 000000000..e76376fa3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow0" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/crystalBow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json new file mode 100644 index 000000000..2e13b0c39 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow1" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/crystalBow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json new file mode 100644 index 000000000..2b2289c0e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow2" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/crystalBow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json new file mode 100644 index 000000000..dcc6f9644 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow3" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/crystalBow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json new file mode 100644 index 000000000..860caf32f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow4" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/crystalBow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json new file mode 100644 index 000000000..35e5b8261 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/crystalBow5" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/dye.json b/src/main/resources/assets/botania/models/item/dye.json new file mode 100644 index 000000000..fc07382cb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dye.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/dye" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fertilizer.json b/src/main/resources/assets/botania/models/item/fertilizer.json new file mode 100644 index 000000000..b127789a4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/fertilizer.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/fertilizer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flowerBag.json b/src/main/resources/assets/botania/models/item/flowerBag.json new file mode 100644 index 000000000..6e2f4268d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flowerBag.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flowerBag" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow.json b/src/main/resources/assets/botania/models/item/livingwoodBow.json new file mode 100644 index 000000000..3219461c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow0" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/livingwoodBow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json new file mode 100644 index 000000000..498e2a420 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow1" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/livingwoodBow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json new file mode 100644 index 000000000..97ac582f0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow2" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/livingwoodBow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json new file mode 100644 index 000000000..46781e351 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json @@ -0,0 +1,18 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/livingwoodBow3" + }, + "display": { + "thirdperson": { + "rotation": [ 5, 80, -45 ], + "translation": [ 0.75, 0, 0.25 ], + "scale": [ 1, 1, 1 ] + }, + "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/obedienceStick.json b/src/main/resources/assets/botania/models/item/obedienceStick.json new file mode 100644 index 000000000..bf67175e8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/obedienceStick.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/obedienceStick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/petal.json b/src/main/resources/assets/botania/models/item/petal.json new file mode 100644 index 000000000..923c5d36e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/petal.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/petal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_air.json b/src/main/resources/assets/botania/models/item/rune_air.json new file mode 100644 index 000000000..59f04d8fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_air.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_autumn.json b/src/main/resources/assets/botania/models/item/rune_autumn.json new file mode 100644 index 000000000..260c1f1d5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_autumn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_earth.json b/src/main/resources/assets/botania/models/item/rune_earth.json new file mode 100644 index 000000000..49567785b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_earth.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_envy.json b/src/main/resources/assets/botania/models/item/rune_envy.json new file mode 100644 index 000000000..0f461b690 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_envy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_fire.json b/src/main/resources/assets/botania/models/item/rune_fire.json new file mode 100644 index 000000000..eda46b5d4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_fire.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_gluttony.json b/src/main/resources/assets/botania/models/item/rune_gluttony.json new file mode 100644 index 000000000..f5a41cfa5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_gluttony.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_greed.json b/src/main/resources/assets/botania/models/item/rune_greed.json new file mode 100644 index 000000000..77df19feb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_greed.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_lust.json b/src/main/resources/assets/botania/models/item/rune_lust.json new file mode 100644 index 000000000..ef7a6fd9e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_lust.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_mana.json b/src/main/resources/assets/botania/models/item/rune_mana.json new file mode 100644 index 000000000..53aa5fb54 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_mana.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_pride.json b/src/main/resources/assets/botania/models/item/rune_pride.json new file mode 100644 index 000000000..69ca1debd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_pride.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_sloth.json b/src/main/resources/assets/botania/models/item/rune_sloth.json new file mode 100644 index 000000000..e348dc95c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_sloth.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_spring.json b/src/main/resources/assets/botania/models/item/rune_spring.json new file mode 100644 index 000000000..ff835b969 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_spring.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_summer.json b/src/main/resources/assets/botania/models/item/rune_summer.json new file mode 100644 index 000000000..f63d15445 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_summer.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_water.json b/src/main/resources/assets/botania/models/item/rune_water.json new file mode 100644 index 000000000..539a67aa7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_water.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_winter.json b/src/main/resources/assets/botania/models/item/rune_winter.json new file mode 100644 index 000000000..82a977e8e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_winter.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/rune_wrath.json b/src/main/resources/assets/botania/models/item/rune_wrath.json new file mode 100644 index 000000000..0c7bfb747 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/rune_wrath.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/rune13" + } +} \ No newline at end of file