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 ff5ce6e81..9d3e0bad8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,10 +8,12 @@ import net.minecraft.block.BlockFlower; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockSlab; import net.minecraft.block.BlockWall; +import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; @@ -79,6 +81,8 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.item.ItemManaGun; +import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -122,16 +126,26 @@ public final class ModelHandler { registerRunes(); registerBows(); registerLens(); + registerBrews(); - registerItemModelAllMeta(laputaShard, 20); - registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); - registerItemModelAllMeta(dye, EnumDyeColor.values().length); - registerItemModelAllMeta(petal, EnumDyeColor.values().length); - registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); - registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); - registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); - registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); /** Special Item Meshers **/ + ModelLoader.registerItemVariants(manaGun, + new ModelResourceLocation("botania:manaGun", "inventory"), + new ModelResourceLocation("botania:manaGunClip", "inventory"), + new ModelResourceLocation("botania:desuGun", "inventory"), + new ModelResourceLocation("botania:desuGunClip", "inventory")); + ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + String name; + if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) { + name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun"; + } else { + name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun"; + } + return new ModelResourceLocation(name, "inventory"); + } + }); } private static void registerSubtiles() { @@ -294,19 +308,46 @@ public final class ModelHandler { registerItemModel(obedienceStick); registerItemModel(dirtRod); + registerItemModel(waterRod); registerItemModel(cobbleRod); registerItemModel(fireRod); registerItemModel(rainbowRod); registerItemModel(skyDirtRod); registerItemModel(tornadoRod); registerItemModel(terraformRod); + registerItemModel(diviningRod); + registerItemModel(gravityRod); + registerItemModel(missileRod); + registerItemModel(smeltRod); + registerItemModel(exchangeRod); registerItemModel(tornadoRod); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); registerItemModel(openBucket); registerItemModel(bloodPendant); + registerItemModel(manaTablet); + registerItemModel(enderDagger); + registerItemModel(slingshot); + registerItemModel(vineBall); + registerItemModel(regenIvy); + registerItemModel(keepIvy); + registerItemModel(recordGaia1); + registerItemModel(recordGaia2); + registerItemModel(overgrowthSeed); + registerItemModel(worldSeed); + registerItemModel(incenseStick); + registerItemModelAllMeta(laputaShard, 20); + registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length); + registerItemModelAllMeta(dye, EnumDyeColor.values().length); + registerItemModelAllMeta(petal, EnumDyeColor.values().length); + registerItemModelMetas(grassSeeds, LibItemNames.GRASS_SEEDS, 9); + registerItemModelMetas(quartz, LibItemNames.QUARTZ, 8); + registerItemModelMetas(cosmetic, LibItemNames.COSMETIC, 32); + registerItemModelMetas(craftPattern, LibItemNames.CRAFT_PATTERN, 9); + registerItemModelMetas(virus, LibItemNames.VIRUS, 2); + registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3); } private static void registerManaResources() { @@ -350,6 +391,36 @@ public final class ModelHandler { } } + private static void registerBrews() { + ModelLoader.registerItemVariants(vial, new ModelResourceLocation("botania:vial", "inventory"), new ModelResourceLocation("botania:flask", "inventory")); + ModelLoader.setCustomModelResourceLocation(vial, 0, new ModelResourceLocation("botania:vial", "inventory")); + ModelLoader.setCustomModelResourceLocation(vial, 1, new ModelResourceLocation("botania:flask", "inventory")); + + for (int i = 0; i < 6; i++) { + ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); + } + + ModelLoader.setCustomMeshDefinition(brewFlask, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); + return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); + } + }); + + for (int i = 0; i < 4; i++) { + ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); + } + + ModelLoader.setCustomMeshDefinition(brewVial, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); + return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); + } + }); + } + 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/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 0b5d1e74b..8d0144d25 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -16,6 +16,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -44,7 +45,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) { TileIncensePlate plate = (TileIncensePlate) tileentity; - EnumFacing facing = plate.getWorld() != null ? ((EnumFacing) plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS)) : EnumFacing.SOUTH; + EnumFacing facing = plate.getWorld() != null ? plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); @@ -64,25 +65,10 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float s = 0.4F; - GlStateManager.translate(0.1F, -1.46F, 0F); + GlStateManager.translate(-0.075F, -1.25F, 0F); GlStateManager.scale(s, s, s); - GlStateManager.rotate(180F, 0F, 1F, 0F); -// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 -// int renderPass = 0; -// do { -// IIcon icon = stack.getItem().getIcon(stack, renderPass); -// if(icon != null) { -// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); -// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); -// float f = icon.getMinU(); -// float f1 = icon.getMaxU(); -// float f2 = icon.getMinV(); -// float f3 = icon.getMaxV(); -// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); -// GlStateManager.color(1F, 1F, 1F); -// } -// renderPass++; -// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + //GlStateManager.rotate(180F, 0F, 1F, 0F); + Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index db6e8e111..e1dbf87cd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -49,11 +49,14 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); } @Override public IBlockState getStateFromMeta(int meta) { + if (meta < 2 || meta > 5) { + meta = 2; + } return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); } @@ -109,7 +112,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) { - setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis()); + setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis()); } public void setBlockBounds(EnumFacing.Axis axis) { @@ -135,7 +138,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable @Override public int getRenderType() { - return LibRenderIDs.idIncensePlate; + return 2; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 87a9dff12..dcbbd5bd8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -120,7 +120,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN - private boolean isSugoiKawaiiDesuNe(ItemStack stack) { + public boolean isSugoiKawaiiDesuNe(ItemStack stack) { return stack.getDisplayName().equalsIgnoreCase("desu gun"); } diff --git a/src/main/resources/assets/botania/models/item/desuGun.json b/src/main/resources/assets/botania/models/item/desuGun.json new file mode 100644 index 000000000..758cff51a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desuGun.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/desuGun0", + "layer1": "botania:items/desuGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desuGunClip.json b/src/main/resources/assets/botania/models/item/desuGunClip.json new file mode 100644 index 000000000..8c966f328 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desuGunClip.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/desuGun2", + "layer1": "botania:items/desuGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diviningRod.json b/src/main/resources/assets/botania/models/item/diviningRod.json new file mode 100644 index 000000000..c845751de --- /dev/null +++ b/src/main/resources/assets/botania/models/item/diviningRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/diviningRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderDagger.json b/src/main/resources/assets/botania/models/item/enderDagger.json new file mode 100644 index 000000000..c80b02fd6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderDagger.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/enderDagger0", + "layer1": "botania:items/enderDagger1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/exchangeRod.json b/src/main/resources/assets/botania/models/item/exchangeRod.json new file mode 100644 index 000000000..73399018a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/exchangeRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/exchangeRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask.json b/src/main/resources/assets/botania/models/item/flask.json new file mode 100644 index 000000000..c928472fa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_0.json b/src/main/resources/assets/botania/models/item/flask1_0.json new file mode 100644 index 000000000..0a1e36b81 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_0.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_1.json b/src/main/resources/assets/botania/models/item/flask1_1.json new file mode 100644 index 000000000..1bb57f645 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_2.json b/src/main/resources/assets/botania/models/item/flask1_2.json new file mode 100644 index 000000000..2b9e5bd7b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_3.json b/src/main/resources/assets/botania/models/item/flask1_3.json new file mode 100644 index 000000000..f12b33a32 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_4.json b/src/main/resources/assets/botania/models/item/flask1_4.json new file mode 100644 index 000000000..7d206c59a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_4.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flask1_5.json b/src/main/resources/assets/botania/models/item/flask1_5.json new file mode 100644 index 000000000..02f2c4061 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flask1_5.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flask0", + "layer1": "botania:items/flask1_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn0.json b/src/main/resources/assets/botania/models/item/grassHorn0.json new file mode 100644 index 000000000..cfa93bea9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassHorn0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassHorn0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn1.json b/src/main/resources/assets/botania/models/item/grassHorn1.json new file mode 100644 index 000000000..14eb11e09 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassHorn1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassHorn1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn2.json b/src/main/resources/assets/botania/models/item/grassHorn2.json new file mode 100644 index 000000000..f6ffb7eef --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassHorn2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/grassHorn2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gravityRod.json b/src/main/resources/assets/botania/models/item/gravityRod.json new file mode 100644 index 000000000..5fecdb85b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gravityRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/gravityRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/incenseStick.json b/src/main/resources/assets/botania/models/item/incenseStick.json new file mode 100644 index 000000000..ab0ea3d09 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/incenseStick.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/incenseStick0", + "layer1": "botania:items/incenseStick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/keepIvy.json b/src/main/resources/assets/botania/models/item/keepIvy.json new file mode 100644 index 000000000..dade275c4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/keepIvy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/keepIvy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/manaGun.json new file mode 100644 index 000000000..8fd397c2f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGun.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaGun0", + "layer1": "botania:items/manaGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/manaGunClip.json new file mode 100644 index 000000000..daec0166e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaGunClip.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaGun2", + "layer1": "botania:items/manaGun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaTablet.json b/src/main/resources/assets/botania/models/item/manaTablet.json new file mode 100644 index 000000000..755e2fd7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaTablet.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaTablet0", + "layer1": "botania:items/manaTablet1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/missileRod.json b/src/main/resources/assets/botania/models/item/missileRod.json new file mode 100644 index 000000000..8a711f8f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/missileRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/missileRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/overgrowthSeed.json b/src/main/resources/assets/botania/models/item/overgrowthSeed.json new file mode 100644 index 000000000..fa0a275d7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/overgrowthSeed.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/overgrowthSeed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordGaia1.json b/src/main/resources/assets/botania/models/item/recordGaia1.json new file mode 100644 index 000000000..ba31e34b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/recordGaia1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/recordGaia1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordGaia2.json b/src/main/resources/assets/botania/models/item/recordGaia2.json new file mode 100644 index 000000000..0f4886ddc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/recordGaia2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/recordGaia2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/regenIvy.json b/src/main/resources/assets/botania/models/item/regenIvy.json new file mode 100644 index 000000000..55bbd12b0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/regenIvy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/regenIvy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slingshot.json b/src/main/resources/assets/botania/models/item/slingshot.json new file mode 100644 index 000000000..210997e61 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slingshot.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/slingshot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/smeltRod.json b/src/main/resources/assets/botania/models/item/smeltRod.json new file mode 100644 index 000000000..93cccc526 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/smeltRod.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/smeltRod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial.json b/src/main/resources/assets/botania/models/item/vial.json new file mode 100644 index 000000000..2759bc178 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_0.json b/src/main/resources/assets/botania/models/item/vial1_0.json new file mode 100644 index 000000000..c5f4e920e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_0.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_1.json b/src/main/resources/assets/botania/models/item/vial1_1.json new file mode 100644 index 000000000..4a46d049f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_1.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_2.json b/src/main/resources/assets/botania/models/item/vial1_2.json new file mode 100644 index 000000000..4e87695c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_2.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vial1_3.json b/src/main/resources/assets/botania/models/item/vial1_3.json new file mode 100644 index 000000000..b3d9ee9db --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vial1_3.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vial0", + "layer1": "botania:items/vial1_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vineBall.json b/src/main/resources/assets/botania/models/item/vineBall.json new file mode 100644 index 000000000..dfea69fba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vineBall.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/vineBall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/virus0.json b/src/main/resources/assets/botania/models/item/virus0.json new file mode 100644 index 000000000..a7da91f14 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/virus0.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/virus0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/virus1.json b/src/main/resources/assets/botania/models/item/virus1.json new file mode 100644 index 000000000..3c632a483 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/virus1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/virus1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/worldSeed.json b/src/main/resources/assets/botania/models/item/worldSeed.json new file mode 100644 index 000000000..1088eae34 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/worldSeed.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/worldSeed" + } +} \ No newline at end of file