From 33b423aaa18fbf58c6b0637b42923ce7a7e5527f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 20:28:08 -0600 Subject: [PATCH] Lexicon item model. Alf/managlass blocks, altgrass --- .../client/core/handler/ModelHandler.java | 34 +++++++++++++++---- .../vazkii/botania/client/fx/FXSparkle.java | 12 +++---- .../botania/common/block/BlockAltGrass.java | 6 ++-- .../common/block/decor/BlockElfGlass.java | 10 ------ .../assets/botania/blockstates/altGrass.json | 10 ++++++ .../assets/botania/blockstates/elfGlass.json | 10 ++++++ .../assets/botania/blockstates/manaGlass.json | 7 ++++ .../botania/models/block/altGrass_dry.json | 8 +++++ .../botania/models/block/altGrass_golden.json | 8 +++++ .../models/block/altGrass_infused.json | 8 +++++ .../models/block/altGrass_mutated.json | 8 +++++ .../models/block/altGrass_scorched.json | 8 +++++ .../botania/models/block/altGrass_vivid.json | 8 +++++ .../assets/botania/models/block/elfGlass.json | 6 ++++ .../botania/models/block/elfGlass0.json | 6 ++++ .../botania/models/block/elfGlass1.json | 6 ++++ .../botania/models/block/elfGlass2.json | 6 ++++ .../botania/models/block/elfGlass3.json | 6 ++++ .../botania/models/block/manaGlass.json | 6 ++++ .../botania/models/item/altGrass_dry.json | 10 ++++++ .../botania/models/item/altGrass_golden.json | 10 ++++++ .../botania/models/item/altGrass_infused.json | 10 ++++++ .../botania/models/item/altGrass_mutated.json | 10 ++++++ .../models/item/altGrass_scorched.json | 10 ++++++ .../botania/models/item/altGrass_vivid.json | 10 ++++++ .../assets/botania/models/item/elfGlass.json | 10 ++++++ .../assets/botania/models/item/lexicon.json | 6 ++++ .../assets/botania/models/item/manaGlass.json | 10 ++++++ 28 files changed, 234 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/altGrass.json create mode 100644 src/main/resources/assets/botania/blockstates/elfGlass.json create mode 100644 src/main/resources/assets/botania/blockstates/manaGlass.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_dry.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_golden.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_infused.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_mutated.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_scorched.json create mode 100644 src/main/resources/assets/botania/models/block/altGrass_vivid.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass0.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass1.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass2.json create mode 100644 src/main/resources/assets/botania/models/block/elfGlass3.json create mode 100644 src/main/resources/assets/botania/models/block/manaGlass.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_dry.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_golden.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_infused.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_mutated.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_scorched.json create mode 100644 src/main/resources/assets/botania/models/item/altGrass_vivid.json create mode 100644 src/main/resources/assets/botania/models/item/elfGlass.json create mode 100644 src/main/resources/assets/botania/models/item/lexicon.json create mode 100644 src/main/resources/assets/botania/models/item/manaGlass.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 6ca637560..6c05414a8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -14,12 +14,15 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameData; +import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; 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 vazkii.botania.common.item.ItemGaiaHead; +import vazkii.botania.common.item.ModItems; import java.util.List; @@ -37,10 +40,16 @@ public final class ModelHandler { registerMushroomItemBlocks(); registerFlowerItemBlocks(); registerLivingRockWood(); + registerAltGrass(); registerStairs(); registerSlabs(); registerFullSlabs(); + registerPanes(); + registerItemModel(ModBlocks.manaGlass); + registerItemModel(ModBlocks.elfGlass); + /** Normal Items **/ + registerItemModel(ModItems.lexicon); /** Special Item Meshers **/ } @@ -112,10 +121,19 @@ public final class ModelHandler { } } + private static void registerAltGrass() { + Item item = ItemGaiaHead.getItemFromBlock(ModBlocks.altGrass); + for (AltGrassVariant variant : AltGrassVariant.values()) { + String name = "botania:altGrass_" + variant.getName(); + ModelLoader.addVariantName(item, name); + ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); + } + } + private static void registerStorageItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.storage); for (StorageVariant variant : StorageVariant.values()) { - String name = "botania:" + "storage_" + variant.getName(); + String name = "botania:storage_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } @@ -124,7 +142,7 @@ public final class ModelHandler { private static void registerMushroomItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.mushroom); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + "mushroom_" + color.getName(); + String name = "botania:mushroom_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } @@ -133,14 +151,14 @@ public final class ModelHandler { private static void registerFlowerItemBlocks() { Item item = Item.getItemFromBlock(ModBlocks.flower); for (EnumDyeColor color : EnumDyeColor.values()) { - String name = "botania:" + "flower_" + color.getName(); + String name = "botania:flower_" + color.getName(); 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:" + "shinyFlower_" + color.getName(); + String name = "botania:shinyFlower_" + color.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory")); } @@ -149,14 +167,14 @@ public final class ModelHandler { private static void registerLivingRockWood() { Item item = Item.getItemFromBlock(ModBlocks.livingrock); for (LivingRockVariant variant : LivingRockVariant.values()) { - String name = "botania:" + "livingrock_" + variant.getName(); + String name = "botania:livingrock_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } item = Item.getItemFromBlock(ModBlocks.livingwood); for (LivingWoodVariant variant : LivingWoodVariant.values()) { - String name = "botania:" + "livingwood_" + variant.getName(); + String name = "botania:livingwood_" + variant.getName(); ModelLoader.addVariantName(item, name); ModelLoader.setCustomModelResourceLocation(item, variant.ordinal(), new ModelResourceLocation(name, "inventory")); } @@ -178,6 +196,10 @@ public final class ModelHandler { } + private static void registerPanes() { + + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index aa2448722..4e867bc1a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -72,13 +72,13 @@ public class FXSparkle extends EntityFX { GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) sparkle.renderQueued(tessellator); tessellator.draw(); ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedCorruptRenders) sparkle.renderQueued(tessellator); tessellator.draw(); @@ -106,10 +106,10 @@ public class FXSparkle extends EntityFX { float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); float var16 = 1.0F; - tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); - tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index ff3dbef55..a9f7bf03c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -88,10 +88,10 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); - Block block = world.getBlockState(pos1.up()).getBlock(); + world.getBlockState(pos1.up()).getBlock(); - if(world.getBlockState(pos1).getBlock() == Blocks.dirt && world.getBlockState(pos).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos.up()) <= 2) - world.setBlockState(pos, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); + if(world.getBlockState(pos1).getBlock() == Blocks.dirt && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) + world.setBlockState(pos1, this.getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, variant), 1 | 2); } } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index 5f07c73af..1cb7fe057 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -10,17 +10,13 @@ */ package vazkii.botania.common.block.decor; -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -30,12 +26,6 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico super(LibBlockNames.ELF_GLASS); } -// @Override -// public IIcon getIcon(IBlockAccess world, int x, int y, int z, int s) { -// int v = (int) Math.floor(new Random(x * 10 ^ y * 20 ^ z * 30).nextInt(ICON_COUNT * 100) / 100.0); -// return icons[v]; -// } // todo 1.8 use randomized states for this - @Override public boolean isElvenItem(ItemStack stack) { return true; diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altGrass.json new file mode 100644 index 000000000..a9c6f7706 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/altGrass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "variant=dry": { "model": "botania:altGrass_dry" }, + "variant=golden": { "model": "botania:altGrass_golden" }, + "variant=vivid": { "model": "botania:altGrass_vivid" }, + "variant=scorched": { "model": "botania:altGrass_scorched" }, + "variant=infused": { "model": "botania:altGrass_infused" }, + "variant=mutated": { "model": "botania:altGrass_mutated" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elfGlass.json b/src/main/resources/assets/botania/blockstates/elfGlass.json new file mode 100644 index 000000000..fd88d3deb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elfGlass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "normal": [ + { "model": "botania:elfGlass0" }, + { "model": "botania:elfGlass1" }, + { "model": "botania:elfGlass2" }, + { "model": "botania:elfGlass3" } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/manaGlass.json new file mode 100644 index 000000000..4ca5115ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaGlass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "normal": { + "model": "botania:manaGlass" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_dry.json b/src/main/resources/assets/botania/models/block/altGrass_dry.json new file mode 100644 index 000000000..dfb175331 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_dry.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass0", + "side": "botania:blocks/altGrass1", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_golden.json b/src/main/resources/assets/botania/models/block/altGrass_golden.json new file mode 100644 index 000000000..24668bae6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_golden.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass2", + "side": "botania:blocks/altGrass3", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_infused.json b/src/main/resources/assets/botania/models/block/altGrass_infused.json new file mode 100644 index 000000000..cba653bda --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_infused.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass8", + "side": "botania:blocks/altGrass9", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_mutated.json b/src/main/resources/assets/botania/models/block/altGrass_mutated.json new file mode 100644 index 000000000..33e9ce82b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_mutated.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass10", + "side": "botania:blocks/altGrass11", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_scorched.json b/src/main/resources/assets/botania/models/block/altGrass_scorched.json new file mode 100644 index 000000000..c79993e04 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_scorched.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass6", + "side": "botania:blocks/altGrass7", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altGrass_vivid.json b/src/main/resources/assets/botania/models/block/altGrass_vivid.json new file mode 100644 index 000000000..f1226714e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altGrass_vivid.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "botania:blocks/altGrass4", + "side": "botania:blocks/altGrass5", + "bottom": "minecraft:blocks/dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass.json b/src/main/resources/assets/botania/models/block/elfGlass.json new file mode 100644 index 000000000..6bea253b2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass0.json b/src/main/resources/assets/botania/models/block/elfGlass0.json new file mode 100644 index 000000000..22f41bd0b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass1.json b/src/main/resources/assets/botania/models/block/elfGlass1.json new file mode 100644 index 000000000..c81653d71 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass2.json b/src/main/resources/assets/botania/models/block/elfGlass2.json new file mode 100644 index 000000000..294ace490 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elfGlass3.json b/src/main/resources/assets/botania/models/block/elfGlass3.json new file mode 100644 index 000000000..842d799df --- /dev/null +++ b/src/main/resources/assets/botania/models/block/elfGlass3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/elfGlass3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manaGlass.json b/src/main/resources/assets/botania/models/block/manaGlass.json new file mode 100644 index 000000000..dc3338aa9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/manaGlass.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/manaGlass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/altGrass_dry.json b/src/main/resources/assets/botania/models/item/altGrass_dry.json new file mode 100644 index 000000000..6a70baf25 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_dry.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_dry", + "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/altGrass_golden.json b/src/main/resources/assets/botania/models/item/altGrass_golden.json new file mode 100644 index 000000000..45751fb50 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_golden.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_golden", + "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/altGrass_infused.json b/src/main/resources/assets/botania/models/item/altGrass_infused.json new file mode 100644 index 000000000..d55365d64 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_infused.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_infused", + "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/altGrass_mutated.json b/src/main/resources/assets/botania/models/item/altGrass_mutated.json new file mode 100644 index 000000000..e4632a5c2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_mutated.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_mutated", + "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/altGrass_scorched.json b/src/main/resources/assets/botania/models/item/altGrass_scorched.json new file mode 100644 index 000000000..d050bcd74 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_scorched.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_scorched", + "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/altGrass_vivid.json b/src/main/resources/assets/botania/models/item/altGrass_vivid.json new file mode 100644 index 000000000..47d5b9a35 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/altGrass_vivid.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/altGrass_vivid", + "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/elfGlass.json b/src/main/resources/assets/botania/models/item/elfGlass.json new file mode 100644 index 000000000..75ea7c4fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elfGlass.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/elfGlass", + "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/lexicon.json b/src/main/resources/assets/botania/models/item/lexicon.json new file mode 100644 index 000000000..37c3bc24d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lexicon.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lexicon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGlass.json b/src/main/resources/assets/botania/models/item/manaGlass.json new file mode 100644 index 000000000..9bd86d80a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGlass.json @@ -0,0 +1,10 @@ +{ + "parent": "botania:block/manaGlass", + "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