From 8f68f49759c9bee8604ddd0c7fbf22d5269270f7 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 1 May 2016 01:06:12 +0200 Subject: [PATCH] Add new coccon models and improve IAlleleCoocon --- .../api/lepidopterology/EnumCocoonType.java | 17 --- .../IAlleleButterflyCocoon.java | 10 +- .../arboriculture/blocks/BlockArbDoor.java | 10 ++ .../blocks/BlockArbFenceGate.java | 10 ++ .../blocks/property/PropertyTree.java | 10 ++ .../blocks/property/PropertyTreeType.java | 10 ++ .../blocks/property/PropertyWoodType.java | 10 ++ .../PluginLepidopterology.java | 2 +- .../lepidopterology/blocks/BlockCocoon.java | 65 +++++----- .../blocks/BlockRegistryLepidopterology.java | 2 + .../blocks/BlockSolidCocoon.java | 38 ++++-- .../blocks/CocoonStateMapper.java | 44 +++++++ .../blocks/property/PropertyCocoon.java | 61 ++++++++++ .../alleles/AlleleButterflyCocoon.java | 53 +++++---- .../items/ItemButterflyGE.java | 9 ++ .../proxy/ProxyLepidopterologyClient.java | 4 - .../lepidopterology/render/ModelCocoon.java | 111 ------------------ .../render/RendererCocoon.java | 58 --------- .../assets/forestry/blockstates/cocoon.json | 0 .../blockstates/cocoons/cocoon_default.json | 7 ++ .../blockstates/cocoons/cocoon_silk.json | 7 ++ .../forestry/models/block/cocoon_early.json | 85 ++++++++++++++ .../forestry/models/block/cocoon_late.json | 85 ++++++++++++++ .../forestry/models/block/cocoon_middle.json | 85 ++++++++++++++ .../models/block/cocoon_silk_late.json | 85 ++++++++++++++ .../forestry/models/item/cocoon_early.json | 6 + .../forestry/models/item/cocoon_late.json | 6 + .../forestry/models/item/cocoon_middle.json | 6 + .../cocoons/cocoon_default_early.json | 18 +++ .../cocoons/cocoon_default_late.json | 18 +++ .../cocoons/cocoon_default_middle.json | 18 +++ .../cocoons/cocoon_silk_early.json | 18 +++ .../cocoons/cocoon_silk_late.json | 18 +++ .../cocoons/cocoon_silk_middle.json | 18 +++ .../lepidopterology/cocoons/cocoon_early.png | Bin 0 -> 519 bytes .../lepidopterology/cocoons/cocoon_late.png | Bin 0 -> 500 bytes .../lepidopterology/cocoons/cocoon_middle.png | Bin 0 -> 508 bytes .../cocoons/cocoon_silk_late.png | Bin 0 -> 15393 bytes .../lepidopterology/cocoons/default_0.png | Bin 671 -> 0 bytes .../lepidopterology/cocoons/default_1.png | Bin 834 -> 0 bytes .../lepidopterology/cocoons/default_2.png | Bin 1041 -> 0 bytes .../blocks/lepidopterology/cocoons/silk_0.png | Bin 635 -> 0 bytes .../blocks/lepidopterology/cocoons/silk_1.png | Bin 769 -> 0 bytes .../blocks/lepidopterology/cocoons/silk_2.png | Bin 961 -> 0 bytes .../textures/items/cocoons/cocoon_early.png | Bin 0 -> 305 bytes .../textures/items/cocoons/cocoon_late.png | Bin 0 -> 301 bytes .../textures/items/cocoons/cocoon_middle.png | Bin 0 -> 301 bytes .../items/cocoons/cocoon_silk_late.png | Bin 0 -> 14940 bytes 48 files changed, 740 insertions(+), 264 deletions(-) delete mode 100644 src/main/java/forestry/api/lepidopterology/EnumCocoonType.java create mode 100644 src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java create mode 100644 src/main/java/forestry/lepidopterology/blocks/property/PropertyCocoon.java delete mode 100644 src/main/java/forestry/lepidopterology/render/ModelCocoon.java delete mode 100644 src/main/java/forestry/lepidopterology/render/RendererCocoon.java delete mode 100644 src/main/resources/assets/forestry/blockstates/cocoon.json create mode 100644 src/main/resources/assets/forestry/blockstates/cocoons/cocoon_default.json create mode 100644 src/main/resources/assets/forestry/blockstates/cocoons/cocoon_silk.json create mode 100644 src/main/resources/assets/forestry/models/block/cocoon_early.json create mode 100644 src/main/resources/assets/forestry/models/block/cocoon_late.json create mode 100644 src/main/resources/assets/forestry/models/block/cocoon_middle.json create mode 100644 src/main/resources/assets/forestry/models/block/cocoon_silk_late.json create mode 100644 src/main/resources/assets/forestry/models/item/cocoon_early.json create mode 100644 src/main/resources/assets/forestry/models/item/cocoon_late.json create mode 100644 src/main/resources/assets/forestry/models/item/cocoon_middle.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json create mode 100644 src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_early.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_late.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_middle.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_silk_late.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_1.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png create mode 100644 src/main/resources/assets/forestry/textures/items/cocoons/cocoon_early.png create mode 100644 src/main/resources/assets/forestry/textures/items/cocoons/cocoon_late.png create mode 100644 src/main/resources/assets/forestry/textures/items/cocoons/cocoon_middle.png create mode 100644 src/main/resources/assets/forestry/textures/items/cocoons/cocoon_silk_late.png diff --git a/src/main/java/forestry/api/lepidopterology/EnumCocoonType.java b/src/main/java/forestry/api/lepidopterology/EnumCocoonType.java deleted file mode 100644 index 7c90e6265..000000000 --- a/src/main/java/forestry/api/lepidopterology/EnumCocoonType.java +++ /dev/null @@ -1,17 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.api.lepidopterology; - -public enum EnumCocoonType { - - DEFAULT, SILK - -} diff --git a/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java b/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java index 440b1cdc9..ba49794b4 100644 --- a/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java +++ b/src/main/java/forestry/api/lepidopterology/IAlleleButterflyCocoon.java @@ -12,18 +12,16 @@ package forestry.api.lepidopterology; import java.util.Map; -import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleProperty; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; -public interface IAlleleButterflyCocoon extends IAllele { - - EnumCocoonType getCocoonType(); - - String getCocoonTexture(int age); +public interface IAlleleButterflyCocoon extends IAlleleProperty { ModelResourceLocation getCocoonItemModel(int age); + String getCocoonName(); + Map getCocoonLoot(); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java index de65f9563..f396abec0 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.arboriculture.blocks; import javax.annotation.Nonnull; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java index e75d7215e..a560e9cab 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFenceGate.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.arboriculture.blocks; import java.util.Collection; diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java index 4250689b7..831a9c633 100644 --- a/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyTree.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.arboriculture.blocks.property; import com.google.common.base.Objects; diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java index 036279ee9..a09955bfc 100644 --- a/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyTreeType.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.arboriculture.blocks.property; import com.google.common.collect.Collections2; diff --git a/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java b/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java index 5b08710f7..769abe86c 100644 --- a/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java +++ b/src/main/java/forestry/arboriculture/blocks/property/PropertyWoodType.java @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ package forestry.arboriculture.blocks.property; import com.google.common.collect.Collections2; diff --git a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java index 31db0c082..466a552a1 100644 --- a/src/main/java/forestry/lepidopterology/PluginLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/PluginLepidopterology.java @@ -118,7 +118,6 @@ public class PluginLepidopterology extends BlankForestryPlugin { ButterflyBranchDefinition.createAlleles(); AlleleButterflyEffect.createAlleles(); - AlleleButterflyCocoon.createAlleles(); GameRegistry.registerTileEntity(TileCocoon.class, "forestry.Cocoon"); proxy.preInitializeRendering(); @@ -142,6 +141,7 @@ public class PluginLepidopterology extends BlankForestryPlugin { MothDefinition.initMoths(); ButterflyDefinition.initButterflies(); + AlleleButterflyCocoon.createLoot(); blocks.lepidopterology.init(); diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java index ef0bbb8c1..574d06af3 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java @@ -16,11 +16,13 @@ import java.util.Random; import forestry.api.core.IStateMapperRegister; import forestry.core.proxy.Proxies; -import forestry.core.render.EmptyStateMapper; import forestry.core.tiles.TileUtil; +import forestry.lepidopterology.blocks.property.PropertyCocoon; +import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon; import forestry.lepidopterology.tiles.TileCocoon; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -33,11 +35,35 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockCocoon extends Block implements ITileEntityProvider, IStateMapperRegister { + private static final PropertyCocoon COCOON = AlleleButterflyCocoon.COCOON; + public BlockCocoon() { super(new MaterialCocoon()); setTickRandomly(true); setStepSound(soundTypeGrass); setCreativeTab(null); + setDefaultState(this.blockState.getBaseState().withProperty(COCOON, AlleleButterflyCocoon.cocoonDefault).withProperty(AlleleButterflyCocoon.AGE, 0)); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, COCOON, AlleleButterflyCocoon.AGE); + } + + @SideOnly(Side.CLIENT) + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); + if(cocoon != null){ + state = state.withProperty(COCOON, cocoon.getCaterpillar().getGenome().getCocoon()).withProperty(AlleleButterflyCocoon.AGE, cocoon.getAge()); + } + return super.getActualState(state, world, pos); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new CocoonStateMapper()); } @Override @@ -77,17 +103,6 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap return 0; } - @Override - public int getRenderType() { - return 2; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerStateMapper() { - Proxies.render.registerStateMapper(this, EmptyStateMapper.instance); - } - @Override public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) { IBlockState stateUp = worldIn.getBlockState(pos.up()); @@ -103,35 +118,13 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap @Override public AxisAlignedBB getSelectedBoundingBox(World world, BlockPos pos) { - TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); - if(cocoon != null){ - if(cocoon.getAge() == 0){ - setBlockBounds(0.375F, 0.5F, 0.4375F, 0.5625F, 1F, 0.6875F); - }else if(cocoon.getAge() == 1){ - setBlockBounds(0.34375F, 0.375F, 0.40625F, 0.59375F, 1F, 0.71875F); - }else if(cocoon.getAge() == 2){ - setBlockBounds(0.34375F, 0.25F, 0.28125F, 0.71875F, 1F, 0.71875F); - }else{ - setBlockBounds(0, 0, 0, 1, 1, 1); - } - } + setBlockBounds(0.3125F, 0.3125F, 0.3125F, 0.6875F, 1F, 0.6875F); return super.getSelectedBoundingBox(world, pos); } @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { - TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); - if(cocoon != null){ - if(cocoon.getAge() == 0){ - setBlockBounds(0.375F, 0.5F, 0.4375F, 0.5625F, 1F, 0.6875F); - }else if(cocoon.getAge() == 1){ - setBlockBounds(0.34375F, 0.375F, 0.40625F, 0.59375F, 1F, 0.71875F); - }else if(cocoon.getAge() == 2){ - setBlockBounds(0.34375F, 0.25F, 0.28125F, 0.71875F, 1F, 0.71875F); - }else{ - setBlockBounds(0, 0, 0, 1, 1, 1); - } - } + setBlockBounds(0, 0, 0, 1, 1, 1); return super.getCollisionBoundingBox(world, pos, state); } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java b/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java index 02ef34762..73feb8135 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockRegistryLepidopterology.java @@ -12,6 +12,7 @@ package forestry.lepidopterology.blocks; import forestry.core.blocks.BlockRegistry; import forestry.core.items.ItemBlockForestry; +import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon; public class BlockRegistryLepidopterology extends BlockRegistry { public final BlockLepidopterology lepidopterology; @@ -20,6 +21,7 @@ public class BlockRegistryLepidopterology extends BlockRegistry { public BlockRegistryLepidopterology() { lepidopterology = registerBlock(new BlockLepidopterology(), ItemBlockForestry.class, "lepidopterology"); + AlleleButterflyCocoon.createAlleles(); cocoon = registerBlock(new BlockCocoon(), ItemBlockForestry.class, "cocoon"); solidCocoon = registerBlock(new BlockSolidCocoon(), ItemBlockForestry.class, "cocoon.solid"); } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java index 7103a4ec7..d0d3c9933 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java @@ -17,9 +17,12 @@ import forestry.core.proxy.Proxies; import forestry.core.render.EmptyStateMapper; import forestry.core.tiles.TileUtil; import forestry.core.utils.ItemStackUtil; +import forestry.lepidopterology.blocks.property.PropertyCocoon; +import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon; import forestry.lepidopterology.tiles.TileCocoon; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -33,6 +36,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSolidCocoon extends Block implements ITileEntityProvider, IStateMapperRegister { + private static final PropertyCocoon COCOON = AlleleButterflyCocoon.COCOON; + public BlockSolidCocoon() { super(new MaterialCocoon()); setHarvestLevel("scoop", 0); @@ -40,6 +45,28 @@ public class BlockSolidCocoon extends Block implements ITileEntityProvider, ISta setTickRandomly(true); setStepSound(soundTypeGrass); setCreativeTab(null); + setDefaultState(this.blockState.getBaseState().withProperty(COCOON, AlleleButterflyCocoon.cocoonDefault).withProperty(AlleleButterflyCocoon.AGE, 0)); + } + + @Override + protected BlockState createBlockState() { + return new BlockState(this, COCOON, AlleleButterflyCocoon.AGE); + } + + @SideOnly(Side.CLIENT) + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); + if(cocoon != null){ + state = state.withProperty(COCOON, cocoon.getCaterpillar().getGenome().getCocoon()).withProperty(AlleleButterflyCocoon.AGE, cocoon.getAge()); + } + return super.getActualState(state, world, pos); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerStateMapper() { + Proxies.render.registerStateMapper(this, new CocoonStateMapper()); } @Override @@ -83,17 +110,6 @@ public class BlockSolidCocoon extends Block implements ITileEntityProvider, ISta return 0; } - @Override - public int getRenderType() { - return 2; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerStateMapper() { - Proxies.render.registerStateMapper(this, EmptyStateMapper.instance); - } - @Override public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) { IBlockState stateUp = worldIn.getBlockState(pos.up()); diff --git a/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java b/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java new file mode 100644 index 000000000..d10b31616 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java @@ -0,0 +1,44 @@ +package forestry.lepidopterology.blocks; + +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.model.ModelResourceLocation; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.arboriculture.IAlleleFruit; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.lepidopterology.IAlleleButterflyCocoon; +import forestry.arboriculture.blocks.BlockFruitPod; +import forestry.core.config.Constants; +import forestry.core.render.ForestryStateMapper; +import forestry.lepidopterology.blocks.property.PropertyCocoon; +import forestry.lepidopterology.genetics.alleles.AlleleButterflyCocoon; + +@SideOnly(Side.CLIENT) +public class CocoonStateMapper extends ForestryStateMapper { + + @Override + public Map putStateModelLocations(Block block) { + if (block instanceof BlockCocoon || block instanceof BlockSolidCocoon) { + for(IAllele allele :AlleleManager.alleleRegistry.getRegisteredAlleles().values()){ + if(allele instanceof IAlleleButterflyCocoon){ + for(int age = 0;age < 3;age++){ + IAlleleButterflyCocoon cocoon = (IAlleleButterflyCocoon) allele; + String resourcePath = Constants.RESOURCE_ID + ":cocoons/cocoon_" + cocoon.getCocoonName(); + IBlockState state = block.getDefaultState().withProperty(AlleleButterflyCocoon.COCOON, cocoon).withProperty(AlleleButterflyCocoon.AGE, age); + String propertyString = "age=" + age; + mapStateModelLocations.put(state, new ModelResourceLocation(resourcePath, propertyString)); + } + } + } + } + return mapStateModelLocations; + } + +} diff --git a/src/main/java/forestry/lepidopterology/blocks/property/PropertyCocoon.java b/src/main/java/forestry/lepidopterology/blocks/property/PropertyCocoon.java new file mode 100644 index 000000000..49cb35845 --- /dev/null +++ b/src/main/java/forestry/lepidopterology/blocks/property/PropertyCocoon.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.lepidopterology.blocks.property; + +import com.google.common.base.Objects; + +import java.util.ArrayList; +import java.util.List; + +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.lepidopterology.IAlleleButterflyCocoon; +import forestry.core.blocks.propertys.PropertyAllele; + +public class PropertyCocoon extends PropertyAllele { + + public PropertyCocoon(String name) { + super(name); + } + + @Override + public Class getValueClass() { + return IAlleleButterflyCocoon.class; + } + + @Override + public String toString() { + return Objects.toStringHelper(this).add("name", this.name).add("clazz", IAlleleButterflyCocoon.class).add("values", this.getAllowedValues()).toString(); + } + + @Override + public int hashCode() { + return 31 * IAlleleTreeSpecies.class.hashCode() + this.name.hashCode(); + } + + @Override + public List getAllowedValues() { + List trees = new ArrayList<>(); + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleButterflyCocoon) { + trees.add((IAlleleButterflyCocoon) allele); + } + } + return trees; + } + + @Override + public String getName(IAlleleButterflyCocoon value) { + return value.getCocoonName(); + } + +} diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java index 3542e9948..9ae3647b7 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java @@ -15,60 +15,68 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; - import forestry.api.genetics.AlleleManager; import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.EnumCocoonType; import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.core.PluginCore; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleCategorized; +import forestry.lepidopterology.blocks.property.PropertyCocoon; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleButterflyCocoon { - + + public static final PropertyCocoon COCOON = new PropertyCocoon("cocoon"); + public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 2); + public static IAlleleButterflyCocoon cocoonDefault; public static IAlleleButterflyCocoon cocoonSilk; private static List cocoonAlleles; public static void createAlleles() { List cocoonAlleles = Arrays.asList( - cocoonDefault = new AlleleButterflyCocoon("default", EnumCocoonType.DEFAULT, false), - cocoonSilk = new AlleleButterflyCocoon("silk", EnumCocoonType.SILK, false) + cocoonDefault = new AlleleButterflyCocoon("default", false), + cocoonSilk = new AlleleButterflyCocoon("silk", false) ); - - cocoonSilk.getCocoonLoot().put(PluginCore.items.craftingMaterial.getSilkWisp(), 0.75F); - cocoonSilk.getCocoonLoot().put(PluginCore.items.craftingMaterial.getSilkWisp(), 0.25F); for (IAlleleButterflyCocoon cocoonAllele : cocoonAlleles) { AlleleManager.alleleRegistry.registerAllele(cocoonAllele, EnumButterflyChromosome.COCOON); } } - @Nonnull - private EnumCocoonType type; + public static void createLoot(){ + cocoonSilk.getCocoonLoot().put(PluginCore.items.craftingMaterial.getSilkWisp(), 0.75F); + cocoonSilk.getCocoonLoot().put(PluginCore.items.craftingMaterial.getSilkWisp(), 0.25F); + } + private Map loot = new HashMap(); + private String name; - public AlleleButterflyCocoon(String name, @Nonnull EnumCocoonType type, boolean isDominant) { + public AlleleButterflyCocoon(String name, boolean isDominant) { super(Constants.MOD_ID, "cocoon", name, isDominant); - this.type = type; + this.name = name; } - - @Override - public EnumCocoonType getCocoonType() { - return type; + + private static String getAgeKey(int age){ + if(age == 0){ + return "early"; + }else if(age == 1){ + return "middle"; + }else{ + return "late"; + } } @Override - public String getCocoonTexture(int age) { - return "textures/blocks/lepidopterology/cocoons/" + type + "_" + age + ".png"; + public String getCocoonName() { + return name; } @Override public ModelResourceLocation getCocoonItemModel(int age) { - return new ModelResourceLocation(Constants.RESOURCE_ID + ":lepidopterology/cocoons/" + type + "_" + age + ".png", "inventory"); + return new ModelResourceLocation(Constants.RESOURCE_ID + ":lepidopterology/cocoons/cocoon_" + name + "_" + getAgeKey(age), "inventory"); } @Override @@ -76,4 +84,9 @@ public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleB return loot; } + @Override + public int compareTo(IAlleleButterflyCocoon o) { + return 0; + } + } diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 28d52379d..97c825d64 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -27,6 +27,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; @@ -36,6 +37,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; +import forestry.api.lepidopterology.IAlleleButterflyCocoon; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; @@ -193,6 +195,13 @@ public class ItemButterflyGE extends ItemGE { break; case COCOON: manager.registerItemModel(item, new CocoonMeshDefinition()); + for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { + if (allele instanceof IAlleleButterflyCocoon) { + for(int age = 0;age < 3;age++){ + manager.registerVariant(this, ((IAlleleButterflyCocoon) allele).getCocoonItemModel(age)); + } + } + } break; default: manager.registerItemModel(item, 0, "liquids/jar"); diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index c8e3a2813..402d39e21 100644 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.lepidopterology.proxy; -import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import forestry.core.models.ModelIndex; import forestry.core.models.ModelManager; @@ -18,8 +17,6 @@ import forestry.core.proxy.Proxies; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.render.ModelButterflyItem; import forestry.lepidopterology.render.RenderButterflyEntity; -import forestry.lepidopterology.render.RendererCocoon; -import forestry.lepidopterology.tiles.TileCocoon; public class ProxyLepidopterologyClient extends ProxyLepidopterology { @@ -27,6 +24,5 @@ public class ProxyLepidopterologyClient extends ProxyLepidopterology { public void preInitializeRendering() { RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity.Factory()); Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation("butterflyGE"), new ModelButterflyItem())); - ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RendererCocoon()); } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelCocoon.java b/src/main/java/forestry/lepidopterology/render/ModelCocoon.java deleted file mode 100644 index 5f93975c3..000000000 --- a/src/main/java/forestry/lepidopterology/render/ModelCocoon.java +++ /dev/null @@ -1,111 +0,0 @@ -package forestry.lepidopterology.render; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelCocoon extends ModelBase { - public ModelRenderer cocoonbody_0_age_2; - public ModelRenderer cocoonbody_1_age_2; - public ModelRenderer cocoonbody_2_age_2; - public ModelRenderer cocoonbody_3_age_2; - public ModelRenderer cocoonbody_4_age_2; - public ModelRenderer cocoonbody_5_age_2; - public ModelRenderer cocoonbody_0_age_1; - public ModelRenderer cocoonbody_1_age_1; - public ModelRenderer cocoonbody_2_age_1; - public ModelRenderer cocoonbody_3_age_1; - public ModelRenderer cocoonbody_4_age_1; - public ModelRenderer cocoonbody_5_age_1; - public ModelRenderer cocoonbody_0_age_0; - public ModelRenderer cocoonbody_1_age_0; - public ModelRenderer cocoonbody_2_age_0; - public ModelRenderer cocoonbody_3_age_0; - public ModelRenderer cocoonbody_4_age_0; - public ModelRenderer cocoonbody_5_age_0; - - - public ModelCocoon() { - this.textureWidth = 64; - this.textureHeight = 32; - this.cocoonbody_1_age_2 = new ModelRenderer(this, 48, 0); - this.cocoonbody_1_age_2.setRotationPoint(-1.5F, 9.0F, -1.5F); - this.cocoonbody_1_age_2.addBox(0.0F, 0.0F, 0.0F, 4, 1, 4, 0.0F); - this.cocoonbody_0_age_2 = new ModelRenderer(this, 31, 0); - this.cocoonbody_0_age_2.setRotationPoint(-0.5F, 8.0F, -0.5F); - this.cocoonbody_0_age_2.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); - this.cocoonbody_2_age_2 = new ModelRenderer(this, 0, 18); - this.cocoonbody_2_age_2.setRotationPoint(-2.5F, 10.0F, -2.5F); - this.cocoonbody_2_age_2.addBox(0.0F, 0.0F, 0.0F, 6, 8, 6, 0.0F); - this.cocoonbody_4_age_2 = new ModelRenderer(this, 0, 7); - this.cocoonbody_4_age_2.setRotationPoint(-2.5F, 18.0F, -2.5F); - this.cocoonbody_4_age_2.addBox(0.0F, 0.0F, 0.0F, 6, 1, 5, 0.0F); - this.cocoonbody_3_age_2 = new ModelRenderer(this, 30, 24); - this.cocoonbody_3_age_2.setRotationPoint(-2.5F, 11.0F, -3.5F); - this.cocoonbody_3_age_2.addBox(0.0F, 0.0F, 0.0F, 6, 7, 1, 0.0F); - this.cocoonbody_5_age_2 = new ModelRenderer(this, 0, 0); - this.cocoonbody_5_age_2.setRotationPoint(-1.5F, 19.0F, -1.0F); - this.cocoonbody_5_age_2.addBox(0.0F, 0.0F, 0.0F, 4, 1, 2, 0.0F); - this.cocoonbody_2_age_1 = new ModelRenderer(this, 0, 18); - this.cocoonbody_2_age_1.setRotationPoint(-2.5F, 10.0F, -2.5F); - this.cocoonbody_2_age_1.addBox(0.0F, 0.0F, 0.0F, 4, 6, 4, 0.0F); - this.cocoonbody_0_age_1 = new ModelRenderer(this, 31, 0); - this.cocoonbody_0_age_1.setRotationPoint(-1.0F, 8.0F, -1.0F); - this.cocoonbody_0_age_1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); - this.cocoonbody_3_age_1 = new ModelRenderer(this, 30, 24); - this.cocoonbody_3_age_1.setRotationPoint(-2.5F, 11.0F, -3.5F); - this.cocoonbody_3_age_1.addBox(0.0F, 0.0F, 0.0F, 4, 5, 1, 0.0F); - this.cocoonbody_1_age_1 = new ModelRenderer(this, 48, 0); - this.cocoonbody_1_age_1.setRotationPoint(-1.5F, 9.0F, -1.5F); - this.cocoonbody_1_age_1.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); - this.cocoonbody_5_age_1 = new ModelRenderer(this, 0, 0); - this.cocoonbody_5_age_1.setRotationPoint(-1.0F, 17.0F, -2.5F); - this.cocoonbody_5_age_1.addBox(0.0F, 0.0F, 0.0F, 2, 1, 3, 0.0F); - this.cocoonbody_4_age_1 = new ModelRenderer(this, 0, 7); - this.cocoonbody_4_age_1.setRotationPoint(-1.5F, 16.0F, -3.0F); - this.cocoonbody_4_age_1.addBox(0.0F, 0.0F, 0.0F, 3, 1, 4, 0.0F); - this.cocoonbody_3_age_0 = new ModelRenderer(this, 30, 24); - this.cocoonbody_3_age_0.setRotationPoint(-2.0F, 11.0F, -3.0F); - this.cocoonbody_3_age_0.addBox(0.0F, 0.0F, 0.0F, 3, 3, 1, 0.0F); - this.cocoonbody_2_age_0 = new ModelRenderer(this, 0, 18); - this.cocoonbody_2_age_0.setRotationPoint(-2.0F, 10.0F, -2.0F); - this.cocoonbody_2_age_0.addBox(0.0F, 0.0F, 0.0F, 3, 4, 3, 0.0F); - this.cocoonbody_4_age_0 = new ModelRenderer(this, 0, 7); - this.cocoonbody_4_age_0.setRotationPoint(-1.5F, 14.0F, -2.5F); - this.cocoonbody_4_age_0.addBox(0.0F, 0.0F, 0.0F, 2, 1, 3, 0.0F); - this.cocoonbody_1_age_0 = new ModelRenderer(this, 48, 0); - this.cocoonbody_1_age_0.setRotationPoint(-1.5F, 9.0F, -1.5F); - this.cocoonbody_1_age_0.addBox(0.0F, 0.0F, 0.0F, 2, 1, 2, 0.0F); - this.cocoonbody_5_age_0 = new ModelRenderer(this, 0, 0); - this.cocoonbody_5_age_0.setRotationPoint(-1.0F, 15.0F, -2.0F); - this.cocoonbody_5_age_0.addBox(0.0F, 0.0F, 0.0F, 1, 1, 2, 0.0F); - this.cocoonbody_0_age_0 = new ModelRenderer(this, 31, 0); - this.cocoonbody_0_age_0.setRotationPoint(-1.0F, 8.0F, -1.0F); - this.cocoonbody_0_age_0.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); - } - - public void renderCucoon(int age){ - float pixel = 0.0625F; - if(age == 0){ - this.cocoonbody_3_age_0.render(pixel); - this.cocoonbody_2_age_0.render(pixel); - this.cocoonbody_4_age_0.render(pixel); - this.cocoonbody_1_age_0.render(pixel); - this.cocoonbody_5_age_0.render(pixel); - this.cocoonbody_0_age_0.render(pixel); - }else if(age == 1){ - this.cocoonbody_2_age_1.render(pixel); - this.cocoonbody_0_age_1.render(pixel); - this.cocoonbody_3_age_1.render(pixel); - this.cocoonbody_1_age_1.render(pixel); - this.cocoonbody_5_age_1.render(pixel); - this.cocoonbody_4_age_1.render(pixel); - }else if(age == 2){ - this.cocoonbody_1_age_2.render(pixel); - this.cocoonbody_0_age_2.render(pixel); - this.cocoonbody_2_age_2.render(pixel); - this.cocoonbody_4_age_2.render(pixel); - this.cocoonbody_3_age_2.render(pixel); - this.cocoonbody_5_age_2.render(pixel); - } - } -} diff --git a/src/main/java/forestry/lepidopterology/render/RendererCocoon.java b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java deleted file mode 100644 index 34cf20967..000000000 --- a/src/main/java/forestry/lepidopterology/render/RendererCocoon.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.lepidopterology.render; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.ResourceLocation; - -import forestry.api.lepidopterology.IAlleleButterflySpecies; -import forestry.api.lepidopterology.IButterfly; -import forestry.core.proxy.Proxies; -import forestry.lepidopterology.blocks.BlockCocoon; -import forestry.lepidopterology.blocks.BlockSolidCocoon; -import forestry.lepidopterology.genetics.MothDefinition; -import forestry.lepidopterology.tiles.TileCocoon; - -public class RendererCocoon extends TileEntitySpecialRenderer { - - private static ModelCocoon modelCocoon = new ModelCocoon(); - - public RendererCocoon() { - } - - @Override - public void renderTileEntityAt(TileCocoon te, double x, double y, double z, float partialTicks, int destroyStage) { - IBlockState state = te.getWorld().getBlockState(te.getPos()); - - if(state == null || !(state.getBlock() instanceof BlockCocoon) && !(state.getBlock() instanceof BlockSolidCocoon)){ - return; - } - IButterfly butterfly = te.getCaterpillar(); - if(butterfly == null){ - butterfly = MothDefinition.BombyxMori.getIndividual(); - } - render(butterfly, te.getAge(), x, y, z); - } - - private static void render(IButterfly butterfly, int age, double x, double y, double z){ - IAlleleButterflySpecies species = butterfly.getGenome().getPrimary(); - GlStateManager.pushMatrix(); - GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - GlStateManager.rotate(180, 0F, 0F, 1F); - GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); - Proxies.render.bindTexture(new ResourceLocation(species.getModID(), butterfly.getGenome().getCocoon().getCocoonTexture(age))); - modelCocoon.renderCucoon(age); - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/resources/assets/forestry/blockstates/cocoon.json b/src/main/resources/assets/forestry/blockstates/cocoon.json deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/resources/assets/forestry/blockstates/cocoons/cocoon_default.json b/src/main/resources/assets/forestry/blockstates/cocoons/cocoon_default.json new file mode 100644 index 000000000..674696f7a --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/cocoons/cocoon_default.json @@ -0,0 +1,7 @@ +{ + "variants": { + "age=0": { "model": "forestry:cocoon_early" }, + "age=1": { "model": "forestry:cocoon_middle" }, + "age=2": { "model": "forestry:cocoon_late" } + } +} diff --git a/src/main/resources/assets/forestry/blockstates/cocoons/cocoon_silk.json b/src/main/resources/assets/forestry/blockstates/cocoons/cocoon_silk.json new file mode 100644 index 000000000..3bd5c72b8 --- /dev/null +++ b/src/main/resources/assets/forestry/blockstates/cocoons/cocoon_silk.json @@ -0,0 +1,7 @@ +{ + "variants": { + "age=0": { "model": "forestry:cocoon_early" }, + "age=1": { "model": "forestry:cocoon_middle" }, + "age=2": { "model": "forestry:cocoon_silk_late" } + } +} diff --git a/src/main/resources/assets/forestry/models/block/cocoon_early.json b/src/main/resources/assets/forestry/models/block/cocoon_early.json new file mode 100644 index 000000000..0ae2adc1b --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/cocoon_early.json @@ -0,0 +1,85 @@ +{ + "textures": { + "0": "forestry:blocks/lepidopterology/cocoons/cocoon_early" + }, + "elements": [ + { + "name": "CocoonLow1", + "from": [ 6.5, 5, 6.5 ], + "to": [ 9.5, 6, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "CocoonLow2", + "from": [ 6, 6, 6 ], + "to": [ 10, 7, 10 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonMid", + "from": [ 5.5, 7.0, 5.5 ], + "to": [ 10.5, 12.0, 10.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "up": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] }, + "down": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] } + } + }, + { + "name": "CocoonHigh1", + "from": [ 6.0, 12.0, 6.0 ], + "to": [ 10.0, 13.0, 10.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonHigh2", + "from": [ 6.5, 13, 6.5 ], + "to": [ 9.5, 14, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "Twig", + "from": [ 7.5, 14.0, 7.5 ], + "to": [ 8.5, 16.0, 8.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 1.0, 8.0, 2.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/cocoon_late.json b/src/main/resources/assets/forestry/models/block/cocoon_late.json new file mode 100644 index 000000000..f729e6949 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/cocoon_late.json @@ -0,0 +1,85 @@ +{ + "textures": { + "0": "forestry:blocks/lepidopterology/cocoons/cocoon_late" + }, + "elements": [ + { + "name": "CocoonLow1", + "from": [ 6.5, 5, 6.5 ], + "to": [ 9.5, 6, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "CocoonLow2", + "from": [ 6, 6, 6 ], + "to": [ 10, 7, 10 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonMid", + "from": [ 5.5, 7.0, 5.5 ], + "to": [ 10.5, 12.0, 10.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "up": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] }, + "down": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] } + } + }, + { + "name": "CocoonHigh1", + "from": [ 6.0, 12.0, 6.0 ], + "to": [ 10.0, 13.0, 10.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonHigh2", + "from": [ 6.5, 13, 6.5 ], + "to": [ 9.5, 14, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "Twig", + "from": [ 7.5, 14.0, 7.5 ], + "to": [ 8.5, 16.0, 8.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 1.0, 8.0, 2.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/cocoon_middle.json b/src/main/resources/assets/forestry/models/block/cocoon_middle.json new file mode 100644 index 000000000..bd1131d03 --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/cocoon_middle.json @@ -0,0 +1,85 @@ +{ + "textures": { + "0": "forestry:blocks/lepidopterology/cocoons/cocoon_middle" + }, + "elements": [ + { + "name": "CocoonLow1", + "from": [ 6.5, 5, 6.5 ], + "to": [ 9.5, 6, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "CocoonLow2", + "from": [ 6, 6, 6 ], + "to": [ 10, 7, 10 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonMid", + "from": [ 5.5, 7.0, 5.5 ], + "to": [ 10.5, 12.0, 10.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "up": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] }, + "down": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] } + } + }, + { + "name": "CocoonHigh1", + "from": [ 6.0, 12.0, 6.0 ], + "to": [ 10.0, 13.0, 10.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonHigh2", + "from": [ 6.5, 13, 6.5 ], + "to": [ 9.5, 14, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "Twig", + "from": [ 7.5, 14.0, 7.5 ], + "to": [ 8.5, 16.0, 8.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 1.0, 8.0, 2.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/cocoon_silk_late.json b/src/main/resources/assets/forestry/models/block/cocoon_silk_late.json new file mode 100644 index 000000000..b3b0d788e --- /dev/null +++ b/src/main/resources/assets/forestry/models/block/cocoon_silk_late.json @@ -0,0 +1,85 @@ +{ + "textures": { + "0": "forestry:blocks/lepidopterology/cocoons/cocoon_silk_late" + }, + "elements": [ + { + "name": "CocoonLow1", + "from": [ 6.5, 5, 6.5 ], + "to": [ 9.5, 6, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 12.0, 3.0, 13.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "CocoonLow2", + "from": [ 6, 6, 6 ], + "to": [ 10, 7, 10 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonMid", + "from": [ 5.5, 7.0, 5.5 ], + "to": [ 10.5, 12.0, 10.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 4.0, 5.0, 9.0 ] }, + "up": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] }, + "down": { "texture": "#0", "uv": [ 11.0, 0.0, 16.0, 5.0 ] } + } + }, + { + "name": "CocoonHigh1", + "from": [ 6.0, 12.0, 6.0 ], + "to": [ 10.0, 13.0, 10.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 2.0, 4.0, 3.0 ] }, + "up": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] }, + "down": { "texture": "#0", "uv": [ 12.0, 6.0, 16.0, 10.0 ] } + } + }, + { + "name": "CocoonHigh2", + "from": [ 6.5, 13, 6.5 ], + "to": [ 9.5, 14, 9.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] }, + "down": { "texture": "#0", "uv": [ 13.0, 11.0, 16.0, 14.0 ] } + } + }, + { + "name": "Twig", + "from": [ 7.5, 14.0, 7.5 ], + "to": [ 8.5, 16.0, 8.5 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 2.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 1.0, 8.0, 2.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/cocoon_early.json b/src/main/resources/assets/forestry/models/item/cocoon_early.json new file mode 100644 index 000000000..0551a5a50 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/cocoon_early.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/cocoons/cocoon_early" + } +} diff --git a/src/main/resources/assets/forestry/models/item/cocoon_late.json b/src/main/resources/assets/forestry/models/item/cocoon_late.json new file mode 100644 index 000000000..9c15a92f1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/cocoon_late.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/cocoons/cocoon_late" + } +} diff --git a/src/main/resources/assets/forestry/models/item/cocoon_middle.json b/src/main/resources/assets/forestry/models/item/cocoon_middle.json new file mode 100644 index 000000000..9c15a92f1 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/cocoon_middle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "items/cocoons/cocoon_late" + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json new file mode 100644 index 000000000..5664c49d9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_early.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cocoons/cocoon_early" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json new file mode 100644 index 000000000..a590e939a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_late.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cocoons/cocoon_late" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json new file mode 100644 index 000000000..180aa4be5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_default_middle.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cocoons/cocoon_middle" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json new file mode 100644 index 000000000..5664c49d9 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_early.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cocoons/cocoon_early" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json new file mode 100644 index 000000000..4abf6e91a --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_late.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cocoons/cocoon_silk_late" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json new file mode 100644 index 000000000..180aa4be5 --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/lepidopterology/cocoons/cocoon_silk_middle.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "forestry:items/cocoons/cocoon_middle" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_early.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_early.png new file mode 100644 index 0000000000000000000000000000000000000000..e14a26d1f70180a676d2b9f0e3318132a6eadadd GIT binary patch literal 519 zcmV+i0{H!jP)1v#2MO^< z>ky*JO)Mf8Y9JI53OW=NTnr_GI8|{L+rc9E54hP3EjSeibtvMXC3Gkq6oj-*Thfb0 zOiiP=H?~O>p;{X>cpRjX6qV@Wvz^2Dy}aN1Dg%=~X{)Ot9@=1fdBn(gV$a!-@F6;;8;MhZXRlzGe_!p#0Yd8&Y z;6;bD+1(^l1}`7KElSX(HIOn5?5g{E4*COa(&<$B_HmV)=LDtRr8)L$agqQ4002ov JPDHLkV1lum-&Ftr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_late.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_late.png new file mode 100644 index 0000000000000000000000000000000000000000..be82935f0050f38e9711baa6161a7dc6b5d6fcae GIT binary patch literal 500 zcmVA#ZBd%fC zNE*@lM?|Bh77~kzSV+W|5G=-?Mv$&WYSM_9l}cs=oB06NE@|UZmzGJ>E)LpiR2M{C zYKmhaq!k*q@$AmY`#$;Q_v)scBg#;1z_YfE&F0XNLTi&rEqVOUf7bpURbEz3g1_!TT10Bkw|;z6%^9d-HF$?OGkSfGk<0gzh{1`mhUYbhC+DOy$lYGJPSAW z_S58=rs4JN;&QJ7P@&f&db$SQOz@IeG)hN%8vvGX4Y=G+bauN{-QRt|s2SK?-yxa2 zVPbOjRq1Q9EG*2aeV;vrh0-q^aKgSmL;2SXEXTiG&a6>mPlW&{S_m qN{OavA4_1jTUC{znpM{tpU(q9-mlIcrfbds0000m-S1C4jLXW%8ovp&* zD8y0hBx0IKxmie~eRC;C$+}G>Qf9l|&L>YBN5K%yEsd-$uOSUgc8mIkk6f5hj6H+t zv9FIn|KUjrTvk<%f+2K&002j^6KTZz1< zkle)8GueVc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_silk_late.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/cocoon_silk_late.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e004252422fbd4a4b06f817ba946f62f63795a GIT binary patch literal 15393 zcmeI3du$xV9mm(8BH|LDN(2##oa0;qf$Z($Zr69q-9ha0E6q8UV}ngApIPZ{?>FE1{eCl_ncv+0v-h>PHP5ZSqMD+pxvedc4tT%R{#`xW-%O@64RNynMv)k&9u85)|<20Ynh3ihU`;0@W7tgHi;D+c;C zJ>>p!--O$xsUi2xLX?fB8o+?oGLi9%K4rV17APFqll}#peQ_68Q zbxY3Dx>=hKQj8M;rjpiDmS*TKJFXlv2Cb0WZ6_*Sg?S}Yr9`?}UEmKHBB&Xh>DGUM1mR-3`iR`PDSt&m@#Ae^hz zkOs14q&p2G5zgS*3Zw7o+{E&qo6gQv!a4_lkaygBXoE-KT|)7|NhsEiiQcU{MVPhA$7x?~i!{ zK;dXM&IvTf0g?8Lbpjn1*t$Bv2I6srFD7yXo0e#0T7&1FoN)B9=c2-7V%#SN__&`I zS>UAuJ~)k-Ad0jsD=f>aF)_}@izzCEnU<cI;xfmvblEDsbD>)}oNmawk+u zPMg54zmU6FfTbg?bYj^)xjL3)#Xj4@id`N+4Kh<&%fl*p7TmPy%Q-s)`S=d^nR8?Y zfQ~D#e5hQnnS+={+{(ylu&f{Mkl9pzKI&9AG<=Y;{|ge@|6n0ZdFcBs!|bZ+doF|X zg!=z2LwOe~1G3%^)G$-rz{Q5ytz3RRr&d<6TBlcH(Ef9hU=_n1CFiP#3o_H%%9->1 zyX|UB4CeaR@hrUHBMiI>u1*4H-Xys2d=Qo3LV(~+f(y?FQ3);t2;L;P@O%)J;6i}l zO@a&02T=(w1PI;0v1k(e+ormpffbOGlKVMy{f$4Wkrw`a5|4 zn4$(*iuz;?MM+yJ>T+XC-((X-RqbhwEbGj^y<_wKmGhR(-#C%nxxqUBrgxG{6IJK0 ztxxzyzIyuOCu{tBHt#zZSopx=5%&4Je4BTi*W|yDOEm|_lD$vUKiT(s@49)bcStoW zUcKz)CGYL~n|jCb^~Sbu;!Eh!?XJ}yiq9Ut?njqDWqzruC*D5P8(Zq>npkeQZv68L zUk!)GcCPG*URihi(|`Zw#givbw0$eyQ@^=8G5+Wuc8{IC@K74#z z+oCxe_Z(ZhWuvgEetXN}vvW2ayOH|()S<(7Uhi+4ylrfj~?AIJ~6-k zmWOHY%J=(6@0on`&gFA!zdo`WB$Hhi_b#mOdadL1-e$e_z=;F>$;?$l6Q9N25%;%m z{XF`}$Zy}|-#vDB@3H2KE;?xqJt?!&il3(M`uWf^gN;WPU;E(bsZ&>u9(n)QTaRy7 zdwh2+d}+RQ`u5I=uBu&&YTUQ}b?HkXW<&Fz&YW4l_dowwczEqK2Y+UMb7s@8cAcxa ztnal)o>=}=%dQ3Y?r&{y8v18+Y$+e(3BU?U#648`~n!)vx)*e*xKt_U-@x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_0.png deleted file mode 100644 index 0bf1505682ea0bc830df0342c19df1a3aeb3e755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 671 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zagsfPd>I(3R2di=ni&{={s+=8 z85l|p7#Ln9FfdrnU|pA>)84XBp0z$3Dlfq`2Hgc&d0t@{HMlqhkHC<)F_D=AMb zN@XZW%*-p%%S$a$Fwry6GyBt%e4l}ViP6)=F(kwJ>5SKTO%4LBmG+{6OVr{P#ARiP zu!dbRd%4;F{F;pu&(63K;gMKh(`aiQQ?_aP%)$C~>uvAE-3l#?<9)e>t3dnv z|7oxP%im`TDwdy=lm4l=IA-64hmGw2o6djjDEjwKN#WnVoBuhk|Mx#EcT`v$sN~U# zrw;a09-oryS+1AcnE4}q=lB1&3#Gs3&Ny*CR?u~}01RoEJo03h_MCsIqx=%zl0}8W znkIao?N&;j3zE_N`RV88oqQrvnNJ@1d@D^@^q}YVzGaVcj_dMVTU>JO=$H3Nzp6`I zN~S4W1b&t?;orP)=Q+5!$P5jWB{f#Ovt@004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stq)9|URA@uxndx@g zFc5|PdOgHo_BMc7Lqo&n4QNmM?9+S2A&q6ZPy#eYKfYu8YO`c%G$T7A@=7?U%I2vl z(WowKzXIt`+O^nC+p?WDacfRLm7wp*+xOSg^GH3!C>Z!vS#-<5g_O>GX@1NeC7HA& z9yeu!tDgQZu>9Ni*VFSzJ#YjUy|TDx-t$OzGp z#;>J19>XYdYl(&)lG6F^g^Uo7>&h|Vjxg_(lw%RtvpC?pe6HeNqv2?^dFGssXQ#BS5#DtqD>e@n=pztVH9n`DB6Tk zw26$M$J2rDVjC>W8rR*|_n+K+G%`Zoc>rUB7><#izvyIyKn(!Bzov47m+Uy49}Y-> zI6==}bTY!rV@Xzi8Qx)Ae$9Qj#5^GNB!q{!h9{`!FFKg=d-paTH_*Wf++0r$0GGn| zSqIN`H6s`xg;)XycbHLPJZhj0bHzmg(I5POHRbDSo#&kg>@WZfkGT{WF;c&Wn7|2# z6qke2-X)|K6J`=oRC zJPzfLwXc`EG-sa&&~ETwf?naN9LgVSUoUrQjN&cWz_7j=R4ysn8eZ|`6Ez@J>_*rB zJ!cee0lzkv6Mv3!x(67H1osh)VK9UT>T@}q{*UimjG|2#MSBqEH*qxvgI47eZ~y=R M07*qoM6N<$f(ILR%>V!Z diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/default_2.png deleted file mode 100644 index 055e330c1ad243d068e695324c9f4873a7bfdb9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1041 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zagsfPd>I(3R2di=ni&{={s+=8 z85l|p7#Ln9FfdrnU|pA>)84XBp0z$3Dlfq`2Hgc&d0t@{HMlqhkHC<)F_D=AMb zN@XZW%*-p%%S$a$Fwry6GyBt%e4l}Vx!BXiF(kwJX=G;cYy*)e&$kNS55M%w?vYGs zlJJ3LbH8oh|ITaK#`&r2Z7IuI_^lhxyjoc9{mtdb0eSN$sh6g_%?)pgj5b@mYfZZ- zr+6;sbJ;yf_kVM|nHFm~WqtkmrsDhW{iTE+#_j*_74t=f<)Xal)64+oRhy(j3?gIW zmhtW>@~QD}`Mgf%)b;)82Y0@|-}8FYZd=nO;yMdtCn&{aHZD)}4RhJw^qZ@0wNtfe z#ulxQv39RBj+9?7^4wQv&%3Ga|HZ@U2hw7UyG$N#d2#4d=$-4m?k$^x-&<8_DD_ky z-gR&dWB1`(Zj3$UEuxGir_;c63qoLHozt|;Qn>Jm|tV6%Wze`OOy#T~u%s!qj+Sa0>* zGK&1>{$E?<(&YR7%$@Jo`_5fD$z;Dr0pBgDTh8jGscZRd`Y(hm$T1LkA)BMyTzUCU zcHP7VGZD^Sy|WR|MW^)(yjB$3-geu*?tjuO&U>48FFJkMc$-Jhf1yRq>skMKQax zr`z)HIC7nde_~s`M*Qdd%yQ=D*?DCGr)>h3ly08K9`h)>k@M20tu?m(aSQInJ4PIi zn%pFCIr2QS-p8#6STcV`?VG2rZ<94^U9OPyW67KMzA?N+m9u+eqwo-6NX5r{cWY{V zT7EawtN2}H?0eDI;hi!6|7ywCKAE*O8p0y;B>D1@jNbD$m)-EV)cG5)A98g+IQ8pX z&<;5xv%vqorx$%wmfOjmkg0MH$&D5JBd&d5ykbyYTUOJvzu?j#_X|wdd{_Sc@$T4; v{iPTCelFPlBPyY3OO0;)`N{l`{<6NxmYUYbcz+%+i!yk+`njxgN@xNAMxWrI diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_0.png deleted file mode 100644 index fa5d8b86e614ab498327f08e0820f5ddce03749e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 635 zcmV->0)+jEP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9ss-AP12RA@uxnQyBB zK@`U4`+p%yN|8ilLqtS~i15Y>aqc|l-jSJ(a_?<7=4|~k=h-uM_spN2IctcBsaC60 zuh(ty+s=wcqd}cc#}?)Duj1~1JRZ|_yS0++7jiFLE*Ja5hv$$c!{Lx7lL;*r3;Maf z==Tcl{`dPmt=DT5MZXY(3diG-`u#qQMk6|(&uoW|@5;0LpUq~hh5jL;s0mTjgeYo4 z6g3eFJcBNm%a57}|AS{FNkWIifdkNNHm&44$B1X(m6FfrsaP!1U@)+f?;IlrEq*$k zxa))4?Z(~T4F#M-V8V*AAc~q0MNNpJCPYyaqNoW`)PyK%!ZW1(^ly?2pNMC;#6q{* z<n0WcAJ9(4V7ZT;DJ}G z6=5iZ`2b9Y(9rb}gi@(w>&Sof7b=ws2Ryuf=$9sr8sh)} diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_1.png deleted file mode 100644 index 01658add9d684368a0f8aec42ce00ddeeef5fc09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 769 zcmV+c1OEJpP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stV@X6oRA@uxm~pEy zK@^Ag`+p%KrAQ)0h=>Rg5&ogXdG|S4_nMtW_u{^5ww~Jk&6(YunKNf*jwd1)N~MzY zdOcYz7E-BHeCey~Rg}wRsn_fNt-btF3Wb7v|9`VQ3R95PY9+JTOxo=>k7oH(>2x~M z@AqXq9?Riy@Flz5Bb@7B{vYiTt{%GGuIzR@*=#m491eZy+W3Ej2J^qIR!hwPM>FkB zJVpQ)oX_W%7d09UbtRse3h(fSzrrfIgjIA2tLPFTfe1R8OmzOQ*K1u`s@1ArbZz%3 zgajH*2N3)ShP7Jlp=cUcLP9c`luRb0k$*HAX-BY5n|7Zi)r0*lxGFxiIZM z1+Q2v>L@eXz@7ltXFEBaPBjKl&Q!n?(&@CMQYpW#{e^MED!PPKbP22I5?0YAtfEU; zMVAN(=6Ra^0M9ImVA{u>kPwv*;2uo-xDyiC0FfMFJDf-)bOSUP4D>*h&*y!UYx}qp z5*TqB9waM+XYN1oP~;ttM`8cJTrPFwaeW|R$;fjKpqz8TIW?viu^}#b!&`WaEYJ~L zQTc!%XGj@m0uD)(^O88D2@s-tE|=5!9+eNE6SCQ?dIz3B9{#s6f%><;Z`!{CkB`!z zX0xg8ej^{C7pdp-a`@X^zSh6@{crX!K{G(OGa~^}`2f6tm_TRX1stPEshcl+l%W2- z@0<0W&5!c|jM&*TtS`PtQ2*Zd&3ezqD!v06PfVe)G&*p7Jc8XQ@qy*ntoLlJ;yb|2 zS$P;`Tz$Xa`?6>U;QmavckDZ?qDxpscM$I%?tzZmCEyNp00000NkvXXu0mjfQ=(aj diff --git a/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png b/src/main/resources/assets/forestry/textures/blocks/lepidopterology/cocoons/silk_2.png deleted file mode 100644 index 4ee2bea84cfd3194198496b2b6c8307d84601622..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 961 zcmV;y13vtTP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9suBS}O-RA@uxnGdTm zK@`UK`+p%KMI@0TL_~z#D4|4&dG~kTJ8w*fJBwTP-Ki(LXXlwSGw0vz3XCy=a=C1( z)v6f|hi0`}nR>l$8jXgT&*$dr>nrT?x8HA|)oPh*{qFN9xHtb?E@vv0O4#ML|G$gV z=@kALvtF--(ChU~x7(FT6$%9&-4Nf2*=%O6^&@*0_vX)LaPRgP!gjlrhl9bu91aJ$ zpG+nqV=(R)i-o`);1#g&NBZ6VK8QO1o16auEV|upODM5$LIH2!8o2#$ZsG{MsNe6) zLPw*K#Q$=+l$cMYQl{B#n(=rnAy6unHUlppi;{H-1D78ss6t$yQh}w(0eAtH zX7Sl<)?_jn)9G~NUOQgK39?ucSvsATx`;(NO%dPJQG2$=`quSnES{Wjj~_Nw;io|r zCJCxANl=AJf+|cBRAG{!3cErQe&gZkpsRZ_Y-sQ&ysu0|JpXTuMeg2n{cXh9h z^XX89!1sL`FW`OL<;Ml85Y%clu`C|IMsQ6?aQI;}I3aQxEEbD$I&}GQfhq)870VOj zm&--o3kU_<$N}UD@&V7orjGOJP=$baC&qog2gEuDU`et&u1vhMsHooq9`Rj;*YM$A z>v#F@K!5@kL_Fi}_N6Au_kc(Iu&Ihec=28RVbjKX8UZ_wJ7WnzJmczIV+o({0gw2u zLJMEMtKS{xRmeoxWp*17&$wQc?*Whau0ji6zN_CI=T-dL_W;Weo2uBCujp6DdlmtM z;%XdmX-ok3Lm_U*#BAK-nv_TGxuyjE#1EUQ*q86>hx<;*e`)*uUgD9&gA$ZuAxa;O z7$ghhhSYv0gXM5f55B560{=!o+;<}2pHpItoo8`Oipen%tb)aHQLIEC8{XE z)7O>#0gD`u0{`Ui-z9-U7d%}YLo7}wCrI2oaL?tly`rhl50(9Ye>h$ca*GjaHE#aT z-Q{6$$Le=OqUY@}w@Ex6FN%Mi|Ipw0@cQd~p89`((kklSGar8Vb^FFusRz|otXg<< zLHdHT2Y$R)KfLy`y2QFdn`DbU|IC;#vfbJLyW!!_$>BWp_i7V=eEchXc=GS}1#OIB z%vZilk=SARL(-*HRYGr`?a2>+*`=A851T&X-BI#Hh?(7(`|$Sl^%8ZpzmI{XE z)7O>#0gD`uoYM5S8w7zuXFOdTLo7}wCrI2oaL?tly`rhl50(9Ye>h$ca*GkVynO4w z>64}ur#T%V}|KIBiAHHq=Ub620zmo<34+gjS&i7v9|U0bq0U_{Of&qZ}0IXuF18B wUECBC71@f7h1vA->e{|ae={)ZVVc9hkl^Po^I@lp3eaB+p00i_>zopr0L;65MF0Q* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/cocoons/cocoon_middle.png b/src/main/resources/assets/forestry/textures/items/cocoons/cocoon_middle.png new file mode 100644 index 0000000000000000000000000000000000000000..27b752364899e30cef96761246097cf4a945ffc6 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#0gD`uyojTZ$Vs5k8BZ6-5R22v2@>}X+;jPCuW0J?LuLQpAC4D<++u{LuFd@K z>Z&TSE_UBpgY-{DZj*RUtmFBA{zHG~!_U9Z^VI+QlT`8Rhw0&icb{)um3mNZ#kz$@ z7c5_Y`osJ4`fc6I{f!EW@1$Go_-(^{k?qd@?+p)sZWiZ>x35Y1@$W77;l;=G3)>jO zm`%2XO77TEA#ub-MdI8%%cCDYn;U1c&9N=)Yn(cB=EL9L@AKH#{Yj|!^+GiBqQ&Zb xUgh}=_RW3s_?X4j?GGP}O_z{#WAtNS*dpxu|H-*)3xWP(@O1TaS?83{1OSk`e7XPt literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/cocoons/cocoon_silk_late.png b/src/main/resources/assets/forestry/textures/items/cocoons/cocoon_silk_late.png new file mode 100644 index 0000000000000000000000000000000000000000..a944b356c462156b2d3bb7b7ae9a27a00a8bd561 GIT binary patch literal 14940 zcmeI3U5pb|6vt;{f^PW;2nK>g$D)a%)A{I5w;kJ(-4@slbXj*7=o*R4&fM;f+s=$L z(`|Pj2mt|Aw^`Pdhu3C8b)_&^Lsd3O=zi{)1HbS6K&V_WVQ-3xuP&RiG7cPi1dM8WB6#`O@gS|K ziQpD7!)44A7}I*DEHF6LH>6CBD={^=IvI$UB`8n;j!c&edEJ)EiJ+$|!QXB(8>GE1 z&Uhl&<3*N>u{_6cyu@>oz|qw!m<+&Q zaZAlf1L?KZbkIr!#~jC$ShiFug-YR&VU4nUEEZ!qffWP>_F(Ku-I2?TZm+C}%;=Y9GXW7)kv5IAhbB$H4glLI zS_)V*0jILE+3X!HS1(S3lIv+Xc2L$@gt?wdn70%v6^g^TN+}D-j$sWMMm||tW&JY< z=~T*FRrG^fG+i}H_Cs+N4XM|=t_ISw1Cnq(Mi{Px33Ee2SmMG`hxjljNF3)Asq{oN zGKQ+gNJ~JzJc0J?nSuMe}0LLYJHQ?jythRdQO8=}| z(|pnE-zjkLg8%67s)qXAXy`CL)bB<^>yevu%}K&@!5b*j?2B^$P%5Y0Abj=#$%rV1 z#W;&LqY?dD8RWBR4W4$kyDE9O4T@Fu~9=Yx0&E(8ePB)IT=5HG=n0KuCC7oHE|CAbhE zc$475^Fh1>7Xk!t5?pvbh?n3(fZ$Dn3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4? zK=3BPh3A8K2`&T(-o)Yx)Zb_XI(&_>1m9QWQ>j((T}N8!8OTu7)B_Z?V;4nTyAJOc zDXPd()TM0{CB05jOO5?co?Hw2p6g9_4VAw?|H}HgZSs;m7j}(&*?sE%r_K)yUfq9K zJUIOL-&@bVy8Epqk8a;Hu0N)~vHRDTq|Fmwtc(13=E&g2uaEq-F#OZO>~CQEZFF$q zqJiI+UHIk2c`v+u?c2|;=D!)+oZYPMo1>ilb47dGJ7?~^{K@S-3)=Vou;^s>bld53 z)Ta6Ot!O`S(dqiGd5mwvx{+s^+0CrCn1 literal 0 HcmV?d00001