From 87f2dc0a0add7f37bee0781e1edba69b7600dbb0 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 2 Mar 2016 21:59:45 +0100 Subject: [PATCH] Fix #1084 and Remove New Bee House Model --- src/main/java/forestry/Forestry.java | 1 - .../blocks/BlockTypeApiculture.java | 3 +- .../apiculture/items/ItemHabitatLocator.java | 15 +- .../java/forestry/core/proxy/ProxyRender.java | 3 - .../core/proxy/ProxyRenderClient.java | 8 - .../genetics/AlleleButterflySpecies.java | 3 +- .../proxy/ProxyLepidopterologyClient.java | 7 +- .../render/ModelButterflyItem.java | 43 +-- .../forestry/blockstates/butterflyGE.json | 15 - .../models/block/apiculture_apiary.json | 341 +----------------- .../models/block/apiculture_bee.house.json | 341 +----------------- .../forestry/models/item/butterflyGE.b3d | Bin 4786 -> 0 bytes .../forestry/models/item/butterflyGE.json | 90 +++++ .../forestry/models/item/butterflyGE.mtl | 8 - .../forestry/models/item/butterflyGE.obj | 137 ------- .../textures/items/butterflies/lepiAurora.png | Bin 0 -> 715 bytes .../items/butterflies/lepiBatesia.png | Bin 0 -> 881 bytes .../items/butterflies/lepiBlackSwallow.png | Bin 0 -> 759 bytes .../items/butterflies/lepiBlueDuke.png | Bin 0 -> 545 bytes .../items/butterflies/lepiBlueWing.png | Bin 0 -> 877 bytes .../items/butterflies/lepiBrimstone.png | Bin 0 -> 859 bytes .../items/butterflies/lepiCSpeckledWood.png | Bin 0 -> 816 bytes .../items/butterflies/lepiCabbageWhite.png | Bin 0 -> 760 bytes .../items/butterflies/lepiCitrusSwallow.png | Bin 0 -> 816 bytes .../textures/items/butterflies/lepiComma.png | Bin 0 -> 809 bytes .../items/butterflies/lepiDianaFrit.png | Bin 0 -> 744 bytes .../items/butterflies/lepiEmeraldPeacock.png | Bin 0 -> 859 bytes .../items/butterflies/lepiGlasswing.png | Bin 0 -> 707 bytes .../items/butterflies/lepiGlassyTiger.png | Bin 0 -> 722 bytes .../items/butterflies/lepiGozoraAzure.png | Bin 0 -> 874 bytes .../items/butterflies/lepiLLacewing.png | Bin 0 -> 890 bytes .../items/butterflies/lepiMBlueMorpho.png | Bin 0 -> 839 bytes .../items/butterflies/lepiMSpeckledWood.png | Bin 0 -> 756 bytes .../items/butterflies/lepiMalachite.png | Bin 0 -> 906 bytes .../items/butterflies/lepiMonarch.png | Bin 0 -> 848 bytes .../items/butterflies/lepiPBlueMorpho.png | Bin 0 -> 817 bytes .../items/butterflies/lepiPalaenoSulphur.png | Bin 0 -> 859 bytes .../items/butterflies/lepiPostillion.png | Bin 0 -> 882 bytes .../items/butterflies/lepiPostman.png | Bin 0 -> 818 bytes .../items/butterflies/lepiRBlueMorpho.png | Bin 0 -> 801 bytes .../textures/items/butterflies/lepiReseda.png | Bin 0 -> 862 bytes .../items/butterflies/lepiSpeckledWood.png | Bin 0 -> 912 bytes .../items/butterflies/lepiSpicebush.png | Bin 0 -> 816 bytes .../items/butterflies/lepiSpringAzure.png | Bin 0 -> 873 bytes .../items/butterflies/lepiThoasSwallow.png | Bin 0 -> 858 bytes .../items/butterflies/lepiZebraSwallow.png | Bin 0 -> 768 bytes .../textures/items/butterflies/mothAtlas.png | Bin 0 -> 890 bytes .../items/butterflies/mothBrimstone.png | Bin 0 -> 826 bytes .../items/butterflies/mothLatticedHeath.png | Bin 0 -> 899 bytes 49 files changed, 126 insertions(+), 889 deletions(-) delete mode 100644 src/main/resources/assets/forestry/blockstates/butterflyGE.json delete mode 100644 src/main/resources/assets/forestry/models/item/butterflyGE.b3d create mode 100644 src/main/resources/assets/forestry/models/item/butterflyGE.json delete mode 100644 src/main/resources/assets/forestry/models/item/butterflyGE.mtl delete mode 100644 src/main/resources/assets/forestry/models/item/butterflyGE.obj create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png create mode 100644 src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 538d7a4d5..f50adb711 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -96,7 +96,6 @@ public class Forestry { PluginManager.runPreInit(); - Proxies.render.registerLoaders(); Proxies.render.registerModels(); } diff --git a/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java b/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java index c97c01ac7..83d21fea3 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java +++ b/src/main/java/forestry/apiculture/blocks/BlockTypeApiculture.java @@ -15,12 +15,11 @@ import javax.annotation.Nonnull; import forestry.apiculture.tiles.TileApiary; import forestry.apiculture.tiles.TileBeeHouse; import forestry.core.blocks.IBlockType; -import forestry.core.blocks.IBlockTypeCustom; import forestry.core.blocks.IMachineProperties; import forestry.core.blocks.MachineProperties; import forestry.core.tiles.TileForestry; -public enum BlockTypeApiculture implements IBlockTypeCustom { +public enum BlockTypeApiculture implements IBlockType { APIARY(0, TileApiary.class, "apiary"), BEE_HOUSE(1, TileBeeHouse.class, "bee.house"); diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java index 3130cd46c..e3b191dd6 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -12,14 +12,13 @@ package forestry.apiculture.items; import java.util.List; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,7 +34,7 @@ import forestry.core.items.ItemWithGui; import forestry.core.utils.StringUtil; public class ItemHabitatLocator extends ItemWithGui { - private static final String iconName = "forestry:biomefinder"; + private static final String iconName = "forestry:items/biomefinder"; private final HabitatLocatorLogic locatorLogic; @@ -56,15 +55,11 @@ public class ItemHabitatLocator extends ItemWithGui { } } - /* TEXTURES */ + /* SPRITES */ @SideOnly(Side.CLIENT) - public static TextureAtlasSprite sprite; - - @SideOnly(Side.CLIENT) - public static void registerIcon(TextureMap map) { + public static void registerSprite() { TextureAtlasSprite texture = new TextureHabitatLocator(iconName); - map.setTextureEntry("forestry:biomefinder", texture); - sprite = texture; + Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(iconName, texture); } @SuppressWarnings({"rawtypes", "unchecked"}) diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index 9ce2b871a..dfa6458d2 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -93,9 +93,6 @@ public class ProxyRender { public void registerModels() { } - - public void registerLoaders() { - } /* FX */ diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 00fc3b35c..c3e73965c 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -34,8 +34,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.b3d.B3DLoader; -import net.minecraftforge.client.model.obj.OBJLoader; import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.render.ParticleRenderer; import forestry.apiculture.render.TextureHabitatLocator; @@ -146,12 +144,6 @@ public class ProxyRenderClient extends ProxyRender { public void registerStateMapper(Block block, IStateMapper mapper) { ModelLoader.setCustomStateMapper(block, mapper); } - - @Override - public void registerLoaders() { - B3DLoader.instance.addDomain(Constants.ID); - OBJLoader.instance.addDomain(Constants.ID); - } @Override public void registerModels() { diff --git a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java index b4debf745..131c0b2e1 100755 --- a/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java @@ -198,7 +198,8 @@ public class AlleleButterflySpecies extends AlleleSpecies i @Override public void registerSprites() { - Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(texture.replace(".png", "").replace("textures/", ""), new TextureAtlasButterfly(texture.replace(".png", "").replace("textures/", ""))); + String spriteName = texture.replace(".png", "").replace("textures/", "").replace("entity", "items"); + Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(spriteName, new TextureAtlasButterfly(spriteName)); } @Override diff --git a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java index 26a1e61df..f1b422b76 100644 --- a/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterologyClient.java @@ -11,8 +11,11 @@ package forestry.lepidopterology.proxy; import net.minecraftforge.fml.client.registry.RenderingRegistry; - +import forestry.core.models.ModelIndex; +import forestry.core.models.ModelManager; +import forestry.core.proxy.Proxies; import forestry.lepidopterology.entities.EntityButterfly; +import forestry.lepidopterology.render.ModelButterflyItem; import forestry.lepidopterology.render.RenderButterflyEntity; public class ProxyLepidopterologyClient extends ProxyLepidopterology { @@ -20,6 +23,6 @@ public class ProxyLepidopterologyClient extends ProxyLepidopterology { @Override public void initializeRendering() { RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterflyEntity()); - //Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation(PluginLepidopterology.items.butterflyGE, "butterflyGE"), new ModelButterflyItem())); + Proxies.render.registerModel(new ModelIndex(ModelManager.getInstance().getModelLocation("butterflyGE"), new ModelButterflyItem())); } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index 84a4ff5ed..911a8004e 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -22,6 +22,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -33,18 +34,10 @@ import net.minecraftforge.client.model.ModelLoaderRegistry; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; -import forestry.core.models.TRSRBakedModel; -import forestry.core.utils.Log; public class ModelButterflyItem implements ISmartItemModel { public IRetexturableModel modelButterfly; - public ResourceLocation location; - - public ModelButterflyItem() { - this.location = new ResourceLocation("forestry:item/butterflyGE.b3d"); - //this.location = new ResourceLocation("forestry:item/butterflyGE.obj"); - } @Override public List getFaceQuads(EnumFacing p_177551_1_) { @@ -85,9 +78,9 @@ public class ModelButterflyItem implements ISmartItemModel { public IBakedModel handleItemState(ItemStack item) { if (modelButterfly == null) { try { - modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(location); + modelButterfly = (IRetexturableModel) ModelLoaderRegistry.getModel(new ModelResourceLocation("forestry:butterflyGE", "inventory")); } catch (IOException e) { - Log.warning("Failed to find Butterfly Model for (" + location + ") in the Forestry registry."); + return null; } if (modelButterfly == null) { return null; @@ -98,40 +91,14 @@ public class ModelButterflyItem implements ISmartItemModel { butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate()); } return bakeModel(butterfly); - //return bakeModel(butterfly); } public IBakedModel bakeModel(IButterfly butterfly) { Function textureGetter = new ButterflyTextureGetter(); ImmutableMap.Builder textures = ImmutableMap.builder(); - textures.put("#ButterflyGE", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", "")); - textures.put("Butterfly2texture", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", "")); + textures.put("butterfly", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", "").replace("entity", "items")); modelButterfly = (IRetexturableModel) modelButterfly.retexture(textures.build()); - return new TRSRBakedModel(modelButterfly.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter), -0.5F, -1.5F, 1.5F, 0, (float) Math.PI * 2, 0, 1F); - } - - public static float getIrregularWingYaw(long flapping, float flap) { - long irregular = flapping / 1024; - float wingYaw; - - if (irregular % 11 == 0) { - wingYaw = 0.75f; - } else { - if (irregular % 7 == 0) { - flap *= 4; - flap = flap % 1; - } else if (irregular % 19 == 0) { - flap *= 6; - flap = flap % 1; - } - wingYaw = getRegularWingYaw(flap); - } - - return wingYaw; - } - - private static float getRegularWingYaw(float flap) { - return flap < 0.5 ? 0.75f + flap : 1.75f - flap; + return modelButterfly.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter); } private static class ButterflyTextureGetter implements Function { diff --git a/src/main/resources/assets/forestry/blockstates/butterflyGE.json b/src/main/resources/assets/forestry/blockstates/butterflyGE.json deleted file mode 100644 index 2417a05b7..000000000 --- a/src/main/resources/assets/forestry/blockstates/butterflyGE.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "#Butterfly2texture": "forestry:texture" - }, - "model": "forestry:butterflyGE.obj" - }, - "variants": { - "inventory": [{ - "translation": [ 0, 1.5, -2.75 ], - "transform": "forge:default-block" - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/apiculture_apiary.json b/src/main/resources/assets/forestry/models/block/apiculture_apiary.json index 4d23237ef..10a3833bf 100644 --- a/src/main/resources/assets/forestry/models/block/apiculture_apiary.json +++ b/src/main/resources/assets/forestry/models/block/apiculture_apiary.json @@ -1,335 +1,12 @@ { -"textures": { - "particle": "forestry:blocks/apiary.4", - "front": "forestry:blocks/apiary.4", - "front_2": "forestry:blocks/apiary.2", - "buttom": "forestry:blocks/apiary.0", - "top": "forestry:blocks/apiary.1" -}, -"elements": [ -{ - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "rotation": 180, "texture": "#top" }, - "up": { "uv": [ 0, 0, 16, 16 ], "rotation": 180, "texture": "#top" }, - "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, - "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, - "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, - "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" } - } -}, -{ - "from": [ 1, 0, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, - "up": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, - "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#front_2" }, - "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, - "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, - "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 11, 3.5 ], - "to": [ 16, 12, 5.5 ], - "faces": { - "down": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 8, 2.5 ], - "to": [ 1, 11, 6.5 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, - "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, - "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 7, 1.5 ], - "to": [ 16, 8, 7.5 ], - "faces": { - "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 11, 10.5 ], - "to": [ 1, 12, 12.5 ], - "faces": { - "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" }, - "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 8, 9.5 ], - "to": [ 1, 11, 13.5 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 7, 8.5 ], - "to": [ 1, 8, 14.5 ], - "faces": { - "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" }, - "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 11, 3.5 ], - "to": [ 1, 12, 5.5 ], - "faces": { - "down": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "south": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" }, - "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 8, 2.5 ], - "to": [ 16, 11, 6.5 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" }, - "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 7, 1.5 ], - "to": [ 1, 8, 7.5 ], - "faces": { - "down": { "uv": [ 1, 9, 7, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, - "south": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, - "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 11, 10.5 ], - "to": [ 16, 12, 12.5 ], - "faces": { - "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "south": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 8, 9.5 ], - "to": [ 16, 11, 13.5 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, - "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, - "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 7, 8.5 ], - "to": [ 16, 8, 14.5 ], - "faces": { - "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, - "south": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, - "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 8.5, 7, 15 ], - "to": [ 14.5, 8, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 2.5, 8, 15 ], - "to": [ 6.5, 11, 16 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, - "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 10.5, 11, 15 ], - "to": [ 12.5, 12, 16 ], - "faces": { - "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 1.5, 7, 15 ], - "to": [ 7.5, 8, 16 ], - "faces": { - "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "west": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, - "east": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 9.5, 8, 15 ], - "to": [ 13.5, 11, 16 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 3.5, 11, 15 ], - "to": [ 5.5, 12, 16 ], - "faces": { - "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 8.5, 7, 0 ], - "to": [ 14.5, 8, 1 ], - "faces": { - "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, - "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, - "west": { "uv": [ 1, 8, 2, 9 ], "texture": "#front_2" }, - "east": { "uv": [ 6, 8, 7, 9 ], "texture": "#front_2" } - } -}, -{ - "from": [ 2.5, 8, 0 ], - "to": [ 6.5, 11, 1 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, - "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, - "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front_2" }, - "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front_2" } - } -}, -{ - "from": [ 10.5, 11, 0 ], - "to": [ 12.5, 12, 1 ], - "faces": { - "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, - "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, - "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front_2" }, - "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front_2" } - } -}, -{ - "from": [ 1.5, 7, 0 ], - "to": [ 7.5, 8, 1 ], - "faces": { - "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 270, "texture": "#front_2" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front_2" }, - "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front_2" }, - "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front_2" }, - "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front_2" } - } -}, -{ - "from": [ 9.5, 8, 0 ], - "to": [ 13.5, 11, 1 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, - "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, - "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front_2" }, - "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front_2" } - } -}, -{ - "from": [ 3.5, 11, 0 ], - "to": [ 5.5, 12, 1 ], - "faces": { - "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front_2" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front_2" }, - "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, - "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, - "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front_2" }, - "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front_2" } - } -}, -{ - "from": [ 10.5, 6, 0 ], - "to": [ 11.5, 7, 1 ], - "faces": { - "down": { "uv": [ 5, 10, 4, 9 ], "rotation": 270, "texture": "#front_2" }, - "up": { "uv": [ 4, 9, 5, 10 ], "rotation": 270, "texture": "#front_2" }, - "north": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, - "south": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, - "west": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, - "east": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" } + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/apiary.4", + "down": "forestry:blocks/apiary.0", + "up": "forestry:blocks/apiary.1", + "north": "forestry:blocks/apiary.2", + "east": "forestry:blocks/apiary.4", + "south": "forestry:blocks/apiary.4", + "west": "forestry:blocks/apiary.4" } } -] -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json b/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json index 6640956ef..49f9ae61c 100644 --- a/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json +++ b/src/main/resources/assets/forestry/models/block/apiculture_bee.house.json @@ -1,335 +1,12 @@ { -"textures": { - "particle": "forestry:blocks/beehouse.4", - "front": "forestry:blocks/beehouse.4", - "front_2": "forestry:blocks/beehouse.2", - "buttom": "forestry:blocks/beehouse.0", - "top": "forestry:blocks/beehouse.1" -}, -"elements": [ -{ - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "rotation": 180, "texture": "#top" }, - "up": { "uv": [ 0, 0, 16, 16 ], "rotation": 180, "texture": "#top" }, - "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, - "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, - "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" }, - "east": { "uv": [ 0, 0, 16, 2 ], "texture": "#front" } - } -}, -{ - "from": [ 1, 0, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "down": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, - "up": { "uv": [ 1, 1, 15, 15 ], "rotation": 180, "texture": "#buttom" }, - "north": { "uv": [ 0, 2, 16, 16 ], "texture": "#front_2" }, - "south": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, - "west": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" }, - "east": { "uv": [ 0, 2, 16, 16 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 11, 3.5 ], - "to": [ 16, 12, 5.5 ], - "faces": { - "down": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 8, 2.5 ], - "to": [ 1, 11, 6.5 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, - "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, - "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 7, 1.5 ], - "to": [ 16, 8, 7.5 ], - "faces": { - "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 11, 10.5 ], - "to": [ 1, 12, 12.5 ], - "faces": { - "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" }, - "south": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "west": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "east": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 8, 9.5 ], - "to": [ 1, 11, 13.5 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 7, 8.5 ], - "to": [ 1, 8, 14.5 ], - "faces": { - "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" }, - "south": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "east": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 11, 3.5 ], - "to": [ 1, 12, 5.5 ], - "faces": { - "down": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "south": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" }, - "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 8, 2.5 ], - "to": [ 16, 11, 6.5 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" }, - "south": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "west": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "east": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 0, 7, 1.5 ], - "to": [ 1, 8, 7.5 ], - "faces": { - "down": { "uv": [ 1, 9, 7, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, - "south": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, - "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 11, 10.5 ], - "to": [ 16, 12, 12.5 ], - "faces": { - "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "south": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "west": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "east": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 8, 9.5 ], - "to": [ 16, 11, 13.5 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" }, - "south": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, - "west": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "east": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 15, 7, 8.5 ], - "to": [ 16, 8, 14.5 ], - "faces": { - "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" }, - "south": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, - "west": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "east": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 8.5, 7, 15 ], - "to": [ 14.5, 8, 16 ], - "faces": { - "down": { "uv": [ 9, 9, 15, 8 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front" }, - "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 2.5, 8, 15 ], - "to": [ 6.5, 11, 16 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front" }, - "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front" }, - "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 10.5, 11, 15 ], - "to": [ 12.5, 12, 16 ], - "faces": { - "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front" }, - "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front" }, - "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 1.5, 7, 15 ], - "to": [ 7.5, 8, 16 ], - "faces": { - "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front" }, - "west": { "uv": [ 6, 8, 7, 9 ], "texture": "#front" }, - "east": { "uv": [ 1, 8, 2, 9 ], "texture": "#front" } - } -}, -{ - "from": [ 9.5, 8, 15 ], - "to": [ 13.5, 11, 16 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front" }, - "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front" }, - "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front" }, - "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front" } - } -}, -{ - "from": [ 3.5, 11, 15 ], - "to": [ 5.5, 12, 16 ], - "faces": { - "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 270, "texture": "#front" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 270, "texture": "#front" }, - "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front" }, - "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front" }, - "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front" } - } -}, -{ - "from": [ 8.5, 7, 0 ], - "to": [ 14.5, 8, 1 ], - "faces": { - "down": { "uv": [ 7, 9, 1, 8 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 1, 8, 7, 9 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, - "south": { "uv": [ 1, 8, 7, 9 ], "texture": "#front_2" }, - "west": { "uv": [ 1, 8, 2, 9 ], "texture": "#front_2" }, - "east": { "uv": [ 6, 8, 7, 9 ], "texture": "#front_2" } - } -}, -{ - "from": [ 2.5, 8, 0 ], - "to": [ 6.5, 11, 1 ], - "faces": { - "down": { "uv": [ 14, 8, 10, 7 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 10, 5, 14, 6 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, - "south": { "uv": [ 10, 5, 14, 8 ], "texture": "#front_2" }, - "west": { "uv": [ 13, 5, 14, 8 ], "texture": "#front_2" }, - "east": { "uv": [ 10, 5, 11, 8 ], "texture": "#front_2" } - } -}, -{ - "from": [ 10.5, 11, 0 ], - "to": [ 12.5, 12, 1 ], - "faces": { - "down": { "uv": [ 5, 5, 3, 4 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 3, 4, 5, 5 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, - "south": { "uv": [ 3, 4, 5, 5 ], "texture": "#front_2" }, - "west": { "uv": [ 4, 4, 5, 5 ], "texture": "#front_2" }, - "east": { "uv": [ 3, 4, 4, 5 ], "texture": "#front_2" } - } -}, -{ - "from": [ 1.5, 7, 0 ], - "to": [ 7.5, 8, 1 ], - "faces": { - "down": { "uv": [ 15, 9, 9, 8 ], "rotation": 270, "texture": "#front_2" }, - "up": { "uv": [ 9, 8, 15, 9 ], "rotation": 270, "texture": "#front_2" }, - "north": { "uv": [ 9, 8, 15, 9 ], "texture": "#front_2" }, - "south": { "uv": [ 9, 8, 15, 9 ], "texture": "#front" }, - "west": { "uv": [ 14, 8, 15, 9 ], "texture": "#front_2" }, - "east": { "uv": [ 9, 8, 10, 9 ], "texture": "#front_2" } - } -}, -{ - "from": [ 9.5, 8, 0 ], - "to": [ 13.5, 11, 1 ], - "faces": { - "down": { "uv": [ 6, 8, 2, 7 ], "rotation": 180, "texture": "#front_2" }, - "up": { "uv": [ 2, 5, 6, 6 ], "rotation": 180, "texture": "#front_2" }, - "north": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, - "south": { "uv": [ 2, 5, 6, 8 ], "texture": "#front_2" }, - "west": { "uv": [ 5, 5, 6, 8 ], "texture": "#front_2" }, - "east": { "uv": [ 2, 5, 3, 8 ], "texture": "#front_2" } - } -}, -{ - "from": [ 3.5, 11, 0 ], - "to": [ 5.5, 12, 1 ], - "faces": { - "down": { "uv": [ 13, 5, 11, 4 ], "rotation": 270, "texture": "#front_2" }, - "up": { "uv": [ 11, 4, 13, 5 ], "rotation": 270, "texture": "#front_2" }, - "north": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, - "south": { "uv": [ 11, 4, 13, 5 ], "texture": "#front_2" }, - "west": { "uv": [ 12, 4, 13, 5 ], "texture": "#front_2" }, - "east": { "uv": [ 11, 4, 12, 5 ], "texture": "#front_2" } - } -}, -{ - "from": [ 10.5, 6, 0 ], - "to": [ 11.5, 7, 1 ], - "faces": { - "down": { "uv": [ 5, 10, 4, 9 ], "rotation": 270, "texture": "#front_2" }, - "up": { "uv": [ 4, 9, 5, 10 ], "rotation": 270, "texture": "#front_2" }, - "north": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, - "south": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, - "west": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" }, - "east": { "uv": [ 4, 9, 5, 10 ], "texture": "#front_2" } + "parent": "block/cube", + "textures": { + "particle": "forestry:blocks/beehouse.4", + "down": "forestry:blocks/beehouse.0", + "up": "forestry:blocks/beehouse.1", + "north": "forestry:blocks/beehouse.2", + "east": "forestry:blocks/beehouse.4", + "south": "forestry:blocks/beehouse.4", + "west": "forestry:blocks/beehouse.4" } } -] -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.b3d b/src/main/resources/assets/forestry/models/item/butterflyGE.b3d deleted file mode 100644 index 40fbfd588a600ee0b315fb8dd881d64dff9a659a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4786 zcmbW5%Truc5XO%Nd`6?j_Y*ZL#)wEnqX`TmXrd+o1`=Y7;)5i{7y|(xyZHlHSmi%J zWhWbBnU#=%MV3&NRJq8Ks{8|#mA!tydrrf-Gxy#}d8@waX1+Py{dM=uy+d#B&c3+^ zoV&$2H{3s3?vU-Bo|+n;JbwD;j;ZmVrlu#y+s>Xjk-Xzpu^U&VY*D|LQt4G+f@i#YZN; zuW_l{xr@}+HS*i`lE+-txmmrwD!?xUey&^mBJli`h+peI-#l14-+Z+y==A}?c;drf z4H(ql@WfxO`uJ;#Jy#9!$)}6+@cz7UdY@kBvigeRTm5jY7u14pLr+-=fvG}e_ z{aFnCk)~PGAm8^l%{QqBv3}0`-ts=@;8ztRuRkpjPyE{c!V|wy{qRNmVfl;d`#<{V zkJXo#-{zAw|7$wWW%Z#y*Uxdr0mE{@c6YcLd^@keZ7XlyeFZ_jd{>t+5 zZpDv2Kdljex#anHKj4W!Ciwj6{bxSL`~2zp;WzU8`t#~5(wCPXeP{Jl-(wCQ?{fE1m{@jednM>*UGauqx{#u^-Rs!$)Tfbk_#`&!Nu;0dK z^%tJ_rf()^KJY$&_Ixcr_1Atr|xzosv*eqt{r`gEgU zKGFC8fLur=e~kC})B3r$ zS^P%zCHLPPeR=uOzbc@==)CdhFVeTB=fc|OAL3j7TE0oWiS@(B`vs4FyT3cWe|RATK=N?eEhV2(`WJ7zj(iRKC%8}%^$v~KeK_i_*wf& z{ED!oUO318x2|km#CL9&Uh7HtYlr_T-Dv9UqQ2IZU#s(f9uo&YmhgZ4p48Vt?@w*& zEL}e`q1X4U^PK;usWbV0A@cR36N{cFzN=b(=Hofu#e6((`I#@V$>DjQ-}t=xEPl4W zy!`0ns;I`s{VCFC`k6lweUIr+a#geWVewwS^_Tsp_sl@QLB*rrCFhw>x9+iQeyJ!upGvpo&z`TV8edc&{YmRLeLjEve)Xun-AZE_4TWZ zL;K2qM?cm#ei!@S$D33_lh7>O7JTgO!X3h$!d=0~-Yskv?h)<{K2|@w-FEL6Z5n6<2h3A5geO}lmydb<7eC$g? ztMIb0J^0vHgdM`G0{^GL$G#@C3;eHw|9s$McM5L^ox+>J$G#=(65bZx2|jkWut(?; zST=kt!|oB@6?%h@eNX5U`i1v{kNrT{E9?_K3_kWF;bURHa3J{DgTjC?C=3N3TNZ|e z5#dnqv4@3G;fU}_@UcgQPlaQ`XTisQE{q9Z2ww&t`<3vuFfJSqKK6ugQuszV6@2Ws g!fD|<;Y{$c-wS7j31Kq$*mJ^^FfIHLeC&_He;kw{9smFU diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.json b/src/main/resources/assets/forestry/models/item/butterflyGE.json new file mode 100644 index 000000000..f3538040f --- /dev/null +++ b/src/main/resources/assets/forestry/models/item/butterflyGE.json @@ -0,0 +1,90 @@ +{ +"textures": { + "butterfly": "forestry:items/butterflies/lepiAurora" +}, +"elements": [ +{ + "__comment": "wingRight", + "from": [ 0.5, 13, 1 ], + "to": [ 7.5, 14, 13.5 ], + "faces": { + "down": { "uv": [ 3.5, 0, 7, 6 ], "texture": "#butterfly" }, + "up": { "uv": [ 0, 0, 3.5, 6 ], "texture": "#butterfly" }, + "north": { "uv": [ 9, 15, 16, 16 ], "texture": "#butterfly" }, + "south": { "uv": [ 9, 15, 16, 16 ], "texture": "#butterfly" }, + "west": { "uv": [ 3.5, 15, 16, 16 ], "texture": "#butterfly" }, + "east": { "uv": [ 3.5, 15, 16, 16 ], "texture": "#butterfly" } + } +}, +{ + "__comment": "wingLeft", + "from": [ 8.5, 13, 1 ], + "to": [ 15.5, 14, 13.5 ], + "faces": { + "down": { "uv": [ 3.5, 7, 7, 13 ], "texture": "#butterfly" }, + "up": { "uv": [ 0, 7, 3.5, 13 ], "texture": "#butterfly" }, + "north": { "uv": [ 9, 15, 16, 16 ], "texture": "#butterfly" }, + "south": { "uv": [ 9, 15, 16, 16 ], "texture": "#butterfly" }, + "west": { "uv": [ 3.5, 15, 16, 16 ], "texture": "#butterfly" }, + "east": { "uv": [ 3.5, 15, 16, 16 ], "texture": "#butterfly" } + } +}, +{ + "__comment": "body", + "from": [ 8, 13.5, 3.5 ], + "to": [ 9, 14.5, 9.5 ], + "rotation": { "origin": [ 8, 14.5, 3.5 ], "axis": "z", "angle": -45 }, + "faces": { + "down": { "uv": [ 12, 0, 12.5, 3 ], "texture": "#butterfly" }, + "up": { "uv": [ 11.5, 0, 12, 3 ], "texture": "#butterfly" }, + "north": { "uv": [ 11.5, 3, 12, 3.5 ], "texture": "#butterfly" }, + "south": { "uv": [ 15, 3, 15.5, 3.5 ], "texture": "#butterfly" }, + "west": { "uv": [ 8.5, 3, 11.5, 3.5 ], "texture": "#butterfly" }, + "east": { "uv": [ 12, 3, 15, 3.5 ], "texture": "#butterfly" } + } +}, +{ + "__comment": "eyeRight", + "from": [ 6.9, 14, 3 ], + "to": [ 7.9, 15, 4 ], + "faces": { + "down": { "uv": [ 10, 4, 9.5, 3.5 ], "texture": "#butterfly" }, + "up": { "uv": [ 9, 3.5, 9.5, 4 ], "texture": "#butterfly" }, + "north": { "uv": [ 8.5, 4, 9, 4.5 ], "texture": "#butterfly" }, + "south": { "uv": [ 9, 4, 9.5, 4.5 ], "texture": "#butterfly" }, + "west": { "uv": [ 9.5, 4, 10, 4.5 ], "texture": "#butterfly" }, + "east": { "uv": [ 10, 4, 10.5, 4.5 ], "texture": "#butterfly" } + } +}, +{ + "__comment": "eyeLeft", + "from": [ 8.1, 14, 2.9375 ], + "to": [ 9.1, 15, 3.9375 ], + "faces": { + "down": { "uv": [ 9.5, 4.5, 10, 5 ], "texture": "#butterfly" }, + "up": { "uv": [ 9, 4.5, 9.5, 5 ], "texture": "#butterfly" }, + "north": { "uv": [ 8.5, 5, 9, 5.5 ], "texture": "#butterfly" }, + "south": { "uv": [ 9, 5, 9.5, 5.5 ], "texture": "#butterfly" }, + "west": { "uv": [ 9.5, 5, 10, 5.5 ], "texture": "#butterfly" }, + "east": { "uv": [ 10, 5, 10.5, 5.5 ], "texture": "#butterfly" } + } +} +], +"display": { + "thirdperson": { + "rotation": [ 90, 0, 180 ], + "translation": [ 0, 0, -0.4 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson": { + "rotation": [ 26, -47, 3 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 1, 1 ] + }, + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, -3, 0.5 ], + "scale": [ 1.25, 1.25, 1.25 ] + } +} +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.mtl b/src/main/resources/assets/forestry/models/item/butterflyGE.mtl deleted file mode 100644 index 06ce5cb46..000000000 --- a/src/main/resources/assets/forestry/models/item/butterflyGE.mtl +++ /dev/null @@ -1,8 +0,0 @@ -newmtl ButterflyGE -Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -Ks 0.8 0.8 0.8 -d 1 -illum 2 -map_Kd C:\ForestryMC\forestry\src\main\resources\assets\forestry\textures\entity\butterflies\lepiAurora.png diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.obj b/src/main/resources/assets/forestry/models/item/butterflyGE.obj deleted file mode 100644 index 838b619c6..000000000 --- a/src/main/resources/assets/forestry/models/item/butterflyGE.obj +++ /dev/null @@ -1,137 +0,0 @@ -mtllib butterflyGE.mtl -o Butterfly2 -v 0.031250 -0.093750 -0.375000 -v 0.468750 -0.093750 -0.375000 -v 0.468750 -0.093750 0.437500 -v 0.031250 -0.093750 0.437500 -v 0.031250 -0.031250 -0.375000 -v 0.468750 -0.031250 -0.375000 -v 0.468750 -0.031250 0.437500 -v 0.031250 -0.031250 0.437500 -v 0.006250 -0.031250 -0.281250 -v 0.068750 -0.031250 -0.281250 -v 0.068750 -0.031250 -0.218750 -v 0.006250 -0.031250 -0.218750 -v 0.006250 0.031250 -0.281250 -v 0.068750 0.031250 -0.281250 -v 0.068750 0.031250 -0.218750 -v 0.006250 0.031250 -0.218750 -v -0.068750 -0.031250 -0.281250 -v -0.006250 -0.031250 -0.281250 -v -0.006250 -0.031250 -0.218750 -v -0.068750 -0.031250 -0.218750 -v -0.068750 0.031250 -0.281250 -v -0.006250 0.031250 -0.281250 -v -0.006250 0.031250 -0.218750 -v -0.068750 0.031250 -0.218750 -v -0.468750 -0.093750 -0.375000 -v -0.031250 -0.093750 -0.375000 -v -0.031250 -0.093750 0.437500 -v -0.468750 -0.093750 0.437500 -v -0.468750 -0.031250 -0.375000 -v -0.031250 -0.031250 -0.375000 -v -0.031250 -0.031250 0.437500 -v -0.468750 -0.031250 0.437500 -v 0.000000 -0.088388 -0.250000 -v 0.044194 -0.044194 -0.250000 -v 0.044194 -0.044194 0.125000 -v 0.000000 -0.088388 0.125000 -v -0.044194 -0.044194 -0.250000 -v 0.000000 0.000000 -0.250000 -v 0.000000 0.000000 0.125000 -v -0.044194 -0.044194 0.125000 -vt 0.203125 0.593750 -vt 0.203125 0.562500 -vt 0.312500 0.562500 -vt 0.312500 0.593750 -vt 0.000000 0.593750 -vt 0.000000 0.562500 -vt 0.203125 1.000000 -vt 0.312500 1.000000 -vt 0.515625 0.593750 -vt 0.515625 0.562500 -vt 0.625000 0.562500 -vt 0.625000 0.593750 -vt 0.421875 1.000000 -vt 0.421875 0.593750 -vt 0.640625 0.687500 -vt 0.640625 0.656250 -vt 0.656250 0.656250 -vt 0.656250 0.687500 -vt 0.625000 0.687500 -vt 0.625000 0.656250 -vt 0.640625 0.718750 -vt 0.656250 0.718750 -vt 0.671875 0.687500 -vt 0.671875 0.656250 -vt 0.687500 0.656250 -vt 0.687500 0.687500 -vt 0.671875 0.718750 -vt 0.640625 0.750000 -vt 0.656250 0.750000 -vt 0.625000 0.750000 -vt 0.625000 0.718750 -vt 0.640625 0.781250 -vt 0.656250 0.781250 -vt 0.671875 0.750000 -vt 0.687500 0.718750 -vt 0.687500 0.750000 -vt 0.671875 0.781250 -vt 0.203125 0.156250 -vt 0.203125 0.125000 -vt 0.312500 0.125000 -vt 0.312500 0.156250 -vt 0.000000 0.156250 -vt 0.000000 0.125000 -vt 0.515625 0.156250 -vt 0.515625 0.125000 -vt 0.625000 0.125000 -vt 0.625000 0.156250 -vt 0.421875 0.562500 -vt 0.421875 0.156250 -vt 0.718750 0.812500 -vt 0.718750 0.781250 -vt 0.734375 0.781250 -vt 0.734375 0.812500 -vt 0.625000 0.812500 -vt 0.625000 0.781250 -vt 0.718750 1.000000 -vt 0.734375 1.000000 -vt 0.828125 0.812500 -vt 0.828125 0.781250 -vt 0.843750 0.781250 -vt 0.843750 0.812500 -vt 0.750000 1.000000 -vt 0.750000 0.812500 -usemtl None -s off -f 6/1 2/2 1/3 5/4 -f 7/5 3/6 2/2 6/1 -f 7/7 6/1 5/4 8/8 -f 8/9 4/10 3/11 7/12 -f 5/4 1/3 4/10 8/9 -f 2/13 3/14 4/4 1/8 -f 14/15 10/16 9/17 13/18 -f 15/19 11/20 10/16 14/15 -f 15/21 14/15 13/18 16/22 -f 16/23 12/24 11/25 15/26 -f 13/18 9/17 12/24 16/23 -f 10/27 11/23 12/18 9/22 -f 22/28 18/21 17/22 21/29 -f 23/30 19/31 18/21 22/28 -f 23/32 22/28 21/29 24/33 -f 24/34 20/27 19/35 23/36 -f 21/29 17/22 20/27 24/34 -f 18/37 19/34 20/29 17/33 -f 30/38 26/39 25/40 29/41 -f 31/42 27/43 26/39 30/38 -f 31/2 30/38 29/41 32/3 -f 32/44 28/45 27/46 31/47 -f 29/41 25/40 28/45 32/44 -f 26/48 27/49 28/41 25/3 -f 38/50 34/51 33/52 37/53 -f 39/54 35/55 34/51 38/50 -f 39/56 38/50 37/53 40/57 -f 40/58 36/59 35/60 39/61 -f 37/53 33/52 36/59 40/58 -f 34/62 35/63 36/53 33/57 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png new file mode 100644 index 0000000000000000000000000000000000000000..4cfe7c1652bf3d199f71771abc7d074cc4732bf0 GIT binary patch literal 715 zcmV;+0yO=JP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stElET{R9HvtR!L7& zQ51eaXG#sYlFkUFAQ<&0D1$i1frT-M3l|U#3x1;mYU0iSodi{qA|^Tun!-)k3LMg8Cc?!qEukV++PU8;u6?XGIX5PG?{wV(~@H z2K>hUs@19xNM$qNI|-?&z7V}Shsa#i*cW$QtJQFtN+Ov_qg*b7N1~?x8-Y*|p-9-+ z&*$}te>=|>@+h32Ay+K)P2h@u7Qt|+H$NZmj0piMK^2Y@r+pLP`5O}Wa9aZv$UU4u zyWJKAXe6PQ7=qbOxtZ}icN)i*CmoUl{$N1HNQUDayMD>j_5by*1H~r}{C+VhPwt!q zn3S@hN5tJWEP3qaRnrNO{m*A^+4)H_fgdNwJv+PRb>haf7b{aP#GK>iNPO9}Bmc;T z)Rus zB;GAJK_z$`Oh`36g7ske9b_{y1-%p}(kbgnFtFYc)48maV>LB=Q1(itA{CHEGW=H4 z!v`xLjpdipvmbm~Gg;000WTpez4dxsq-QNqQ`Ue4bOoBtrj+GxTTU^xWVm2(CLf<{ zMl_PJ>==0S$>ejA{cK3=+3W|FDZs|VfB)BWkL>*XsSBC=W8g(aEg3%E?(IuZ65!o{ x!4Fq_)+Qq*|Nfxcn%~D<)&?J8gbNH!`wQeazxWtRzSIB!002ovPDHLkV1h!8IgJ1S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png new file mode 100644 index 0000000000000000000000000000000000000000..127887b1d50094c7fc3032981c9279fcafe4e667 GIT binary patch literal 881 zcmV-%1CIQOP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st(@8`@R9HvFmDx`d zQ544K#Ro|QL1+sVEF$WIVMmAo1)-L&pAh?sr8yvD8rZhI?ZWszVDuUW=2{`WtknwFj^r?`WJ3ZKa0W4%dH-j zoEUHi}6RXehabJQiNSO1+tIWoM3$)+y=ah{Gtc!t2hi!G5FDySM5F|f`zxi1nKD@gRv8GWF|kHILQy#dqmJS?vBn?%M6sz_w4po&Ds3V$dkuMH+k*XkTW zcJ4{IDsG~*@)pe2Zoh^Q87r_dvyP&y>NXrD*HBV^19|2Szjr|-4q!Aj!|J$%ikiE; z`=Zk8>ISeBUPNJWFUqU$pt|-RUoG|?^#a(7uE6HJ%tt`&H=5d2F(+{VGB;Vz^Um|F zy@*drgw1gdSvk!s9>m=Ng3Ncs$00R64a0|B7;7w6CxF>@frl_5ISDCgJMq4$l;4g& z&m2%EKy=JzB&DVxE-?Wg zG}BTCoNeMeBEO&$=^2OA2|ypKiLj_9!lIf8i)tb)st2TBLDAGphdVTJ00000NkvXX Hu0mjfz^s1M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png new file mode 100644 index 0000000000000000000000000000000000000000..6dd53cffa2796d29ae515a994bec7566450396e1 GIT binary patch literal 759 zcmV004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stSxH1eR9HvFSJ`gU zKom7;>^R=-IBC^VQVJ>v_yNS1@W31M9l!$xi0U2-Mk=9dH-zfoGgqA&xSL=`#T6tAFl4;>B`xj|DFp5Nz03Xcel~@ zVuV%zL(|c$n}rluJmliU(&&iKf)H>FyT9UI08)i-&o2srB6Zs)(Q8-Ce1KN$kd|9g)< zNHA8_jK(1)z$!@ROi89<(KOsIguuob4fj_+rjBWQb+9TS1n8Khn8upGeo*zvXcUA1 z9aDN<*^Y~r;4%;bOgmOUx8cZ@t&`nR#Wn~5RzG$`Ih6KD#9m8OP_Yf^7SI`2Py4ZT zSx!YNQc(yH+=iALNevjpgRa%p5g-OCaP^LEONUIR{u}-wK=2?+1(*$c{h_D|LVzEW pw9G-3mN}@>G6z*!=Ab%*_6N86KMMObrN#gN002ovPDHLkV1goZMyvn; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png new file mode 100644 index 0000000000000000000000000000000000000000..ce37498f127aadcc16ffb5fe474a6f043128caea GIT binary patch literal 545 zcmV++0^a?JP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9ssgGod|R9HvFl|4=a zF%X4)4oW(xf^vXm(*y|u2niHX(1aS%A<;lb$+c3!2{_BJZ{la!$P)JcOrG>2?PR3) zWxVk?_wG`UsO9m2c>78!5$Qg=(DnL4E|+KW^!g@0-&<5iQ4v5A{#be@51TeX_`cpM0^mzHTbu>}LhRc9R}@s`008s+5q^6! zldJZy2Ee^MuEblPOPm}5C&2I;fGE5QA^;$K-W(+pxNA>p0Fnv7B}xEz1TexsKb{9o zphOCQF#LK>pf(&r;9r+0yo3m)Yr~;I07xrwzDoB~m_TAfB>*^o+=kc-crmqOVg-Qk z59qd`C4>TC>tXQ_!W;nMTs{OqxETP$aRcrRfEy41xD_qJAqBwF!QD>)*ndB{0stZ6 z378!LuHSe9*a=q0pa8i00m1RdQ}BJ0Nda&X#Sq+#c;2;5rvMN`(AqJv6aXLlbhc>e jY|+x$qNTG%JB#}T?$7#E9jayS00000NkvXXu0mjfT(j8_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png new file mode 100644 index 0000000000000000000000000000000000000000..fd53a537d89aa34307d106c7c86d467f792e88ab GIT binary patch literal 877 zcmV-z1CsoSP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st&q+i|co25pRE?O(y+cc?SK~Pk>XzTXugAYY3xL4{@s>N1C)I7Kq1VI!< z6!8bRA}&w9xPjn*$jkA&H=UR!lbR;Zc;IBdxrBSpcfaM1qy_*mB}s?%dq%}D{;tFX z%6$Wl;=cy$`cBn74_fBy)G{ka`OI>b0UwPQqB=gCc_ihfzai5py%2tEsPLG$?+a4p>iXVq2|+FJ8A(6|3AB>f^WOc$1!0L|WB-o=%O%=|#z;d|K| zFf0a(3GLo}6XL1Imf>;u^^zFtuyOB6jtw1}hQVkCEzPPTlh7Aoi@goB30tOKB7EgN z&z{~(T@gx{HI4@Y7!AgkEqR82qg3JyqhsPZDwhrMG3>nYh4(?@*yF4X9P#@x+0=xw z+FE9+$b6J&rjCkkw2eRG3OGD{ybs9OZ2qiproKM63RsG3uwpohV&^6nrVSan`T?dw zPu2!VoR&Z~kt#ADr6p!JVzHPQ109#%qILQeY_81S@-z-r^mgIh9H z!M%LDb_NQIs`=KV+mB{W$57J>SWDXZ=+OnVCi)3ROQW_1nom7J&)r{q2~i6!b@yr_ zPGAEr?>f*I5w+vC3$OVari$3gLaG~K1GN6s|HHSxbLnXlu0HW-!ObWaumSoWkXtcT zpyl*a{xG5V?Eh2)8=z)H>rYD{e~vYbT!+r!*2VyV&VBpEH|W0hQN-dXFgUa`K=4)X z;*Cd_lG)-_U7WxM=;wb@F{mXKgIZECs3jGH+7Z%kA+ZYgy-P}?00000NkvXXu0mjf DT;+?d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png new file mode 100644 index 0000000000000000000000000000000000000000..250f647e422497bbd90ba0cc2d99dbad7b48492f GIT binary patch literal 859 zcmV-h1El004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9sty-7qtR9HvNmRV~P zQ546=QUo7-@iU0l+Su%i4fr4k;)3`kTu|zZR;(?G3gUwJ>VvdaDJp7JuqI+{tyr

gfM{^4YDZ|>y$?z#8ebA_D7qgHrgHptDY=xFOc zJbBTP|4#r*j5QL_!xL;kBxOT)udZqku9sbCKYOG&fG^p^&NE-l2*gde9O5Qx^W-^>{Nfg5N$(_9!}?6U#yLq>#?RwOb`cK&U?3DJn5 zWB{6JkLwzao!pP-ue)*L)FIFYtXox!mbL?&3A7n=n{wdoT^QD^mi$XDKKP6bK;fUA zwy|@1#zbRT5xBCa78iC11>adb^PCBvLN-Js3nt8%N}D(W^h_qKB?Fw_E`aRZHlZMd zB7kdXBLZO)#+n6Q2FikH+JW1y#*zU@SNE>`y9hiQ)S>U49-@?rp+GhpXi4OEO48-s zHMq2E1upK)MnUdgB1HhwgZ_Gk81*({$Xj2Q^K!H-fL8kd0mh`wNT;IQthx#Ubo8u) zKWgAipi@!qR#ka`>-X1Ua&9vhBRY_%JZFDVR}4V)pPW1t|jFkdDJY?BAq`a}on2VrISxQ4ykQNF|x>ha(>KLGls! z`C|)5f%X7Jfi9<1CFOCdi2*_Z9algq!E_U%O&IV?=YeGMIMu`eoe$UZtZ5_iji{vt z!H5~|Hx1eVkf{36%&8hCQcf;R_xkFz10YfAjejw-bN8@%$MIq@0Db&RQ|#2z6g#yv l#ZE0vu~SP^?9|R6`~gJF4kFREO0)m~002ovPDHLkV1meegCGC^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png new file mode 100644 index 0000000000000000000000000000000000000000..d6013c9976f45742365b3f6341c545b15f86e80a GIT binary patch literal 816 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe9b952f2541bea2f32f31d427314700ff0e96c GIT binary patch literal 744 zcmVP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stN=ZaPR9HvFmRC<3 zK@^1tQ}Jod$iLTlIp3d92BXoz>KnE4 zP{%C}6~{Xz`E`)da6Ovu2)~0T(SUfp>JN3?;!yGJc~*WOPU_2ZGY#d3^j`Y)BGb$8esV7PPC?KT5O2bDxP#&4gF;G z%|=zfQ;?*%kjrSKFN|sU5oh&(US`EFeyq5tm=+J_<%s`%6%-&& zXF3(>Pgln_u)Hv>bNL*d=MuH45g_!7vn>^7^@MY2u06H^z`S1j`Z?kfwP`3mc~j68 z5JqZ%9Fec^f7}UHPWYKSng*AsP4oRlP9wlUbWwmrAeW9`kI#%2AV#RzU^E`M zL~SMxm#EFe;S#lZ1z$HOg*Ihexdi9-z#dU^mZ zAr2x;(4wVbL=6ynE)wo^A|Y>s_AE66)Bv3ew;$gzLlo$e!uJw`8X)u-;2x(J#DKi> zv>?Ox5`!85T))%-CTLDb!IzCpdIkXf8&@*oKeh^qivu;lpNFJ#FikoK)1-4SO*#kD aqnQ7ACa>McBMw&p0000004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9sty-7qtR9HvFR#|J4 zK@^=PX%f^fsHrwK-E8|ciHTI)P;o;A#a(}Zq9C-kir`YZS1b546a~Q@7kuzlQ4ri7 z6c>E(M~I3ZzjL!t^@208!~+K=GvVAb^WC|3OaasC4Dv%~08p7&X>jrJ0e`5klSNd; z4Q9+O&4eaQ-gwoA##J2Z>!g5zTUSKUvZeyFTO!UTG+}c7x*)DT@9~HFIw`20SAo{G z0d#Jwz`YMg!QZ(RJ7~h>m1o_e`}_Q43c|At(mO-A`~C=SzwO1XH$8C42~C*f37mhp z&mZdRq=3Qb_Ws9XXy0P6U{@uon*QB@^$8F(QI|FFwi*m!40DnpYXjWr^_RVpaLoG7 zO;KEWauBKMVKH#w(SEe858?9DL-HT4dC{OB-w(m#XA&}ac25MyKlfws$0(|s-A>?i zI*s9u4iR;s+<=C~0kmy461e}{5Hh>NsBN`3a5kI8L?(l=WD?`4l&`A?(C85_6X5Q73X{ccXlfe*vgT58CTzc-+9+3 zg=nhUu?-Eo9vcvg(9PG~xc1^Om*DG_3iogX{&Y0cF1h_35w}7{<7~1?syD z3LP@9|5s?jwlpy>Ac1LM6lY|dSQ0Fs0X{sujgg{>Q(p%qCtMOy6Sk#1$D3ChX~7I! zcoPI`+;hPdVt{B|8bW+|t`PBUATJ_^_duyA8X)3}3}P7rnyG1bs{^G%3>3b_|Drls lPO6jTq&itns*~j-%uk;R*A2=%(Fgzl002ovPDHLkV1oZbeV+gT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png new file mode 100644 index 0000000000000000000000000000000000000000..ae1386c30f0df9473f1a870b5f257c4ad0a1232e GIT binary patch literal 707 zcmV;!0zCbRP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stB}qg?q_zZ2+#zUJl=}UO0wpYDxJXaHAe3@SLRe+EX$m;$# z)15ueB0`;+e#y@;o4~i&v-hkq++=8Yl>DP(BrtkKu~S(i#5{Eb$bEq)!o$lE$;HZ? z62Hl3oGhZh892|*TBO_MqBBJd`TLsz6!5;3qj$v>CEly9Ke~wF;8O~WO$ZM!MA#Qj*Coh8>^9Lw6J}HmI*=NEp zKE7O?r`wH}HhDI@Fi=59sT6%L6l~wo|1B5eXU;ClErth@A0!gAAB)jpGD+Vu)?LI& z^%!@RDAntAioEC+@~_+QYdTGs1@lzFN%a^%mM5syYEdj2p^uvz>IZ&(O7~p|W&m;o z@6BNeC)Hz|rl+aVXi&4+R9`$vP4z8*2u`X;f^CR<0d|7EC7pni>Tw-Ts>gLWsU8a- z*7M|8A28vhdK9~_OX|$&bMCz+brD;1;rg)kw%Dye@W ze&8aqfZt!bV(_+*m2J7x=@1@N%wgA1GoW`rJR7vzZ9004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stG)Y83R9HvNR#{Km zKoIr=q7ZTt2swa|kjod26DK5TL<$o00MrLs6;U1l@&EtAwBKNF8r9CB;Dt|`?9S{u z^Lci5#!8rIB-W`OUn5uj4@Be%!+`pEjFUSFDok&cm?j7%qRQ7f}!*QPw2 z4EPv4V#~nFBxe%XmIk(3xvNKU7bw;Kmx*XD;u0NK|rR%8QvC| zk9jTjLCj(I*02|(kRKBS%4;jE4J#Gumr8_@7v@CI)M;ohmb`+1wVmQwGn=J$p}=!{ zCq4I{^^XjK3@nozb^hdK0$MUkb}mP)d|o_=2vj1$XXl4wL!+*)F7yl&@ZP?6aKNF5 zsEOda>xYik;5YZ8;F@QG2{bdCBJ7>Ly@j1G1Cax8YNit`FBUlv1l|hoi@=r9AT%MA zVRS~<94Z8XYjb>kZo4f)KRB;M1&07*qoM6N<$ Eg5KLS(f|Me literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png new file mode 100644 index 0000000000000000000000000000000000000000..185926c2e7c00d210da68541c0a5e89bb2e0e835 GIT binary patch literal 874 zcmV-w1C{)VP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st%t=H+R9HvNmibFm zQ547hEdtXtGb1Qxea=kdj9aEf{TcXjpY785OxPR2B6?)Ge5I6RNY%M2z_uM0@UG-0W=0Pn(jYCS>+tgU6@0i z<<6QwDCHqgYE+H^1brDs`liv=+>5IfUyz=&xF!%Pty)|S$OB3kVDRMxD(aSDu3kWH z(fB_DsFh(bgc=$bh{_6dX6mQc8R7(_qE0C7o!IBoib%)DjW z`co}9TLV76;UKf#iV_1Hj&4OvLLW|?`M^ssIy8gCQzHo7-!A%Pl)0x@FgAG_`D%4L z6ayRx3q;hhcElbZ;LPcID5}M&OjaufAVmgg5fk4DT8<+zPbCRXvH`4@{yzZfhFW9! z`YgfC+D2sLF7cN@y}{~sscZl>=G)wWXb)(4)D4xcR62m`m3O%Z(Ek7AK_}kyzn2!E zsAQV=f7*TrUW_q-LUTnrfV_+EP->aAbwZiSBuQ`*17zjDMa_-xsBZYi1xP0&e`T5^ zg~$Ne1*52}|H`w_{ICl{y^|PzHN_3eI?iQcfWqP_ZpCyItH1SwKgFb!k4QK z!l-e1a1sO1&w83&r<7*bDW%zUN@;eT(iz--0{joWIGixl;Q#;t07*qoM6N<$g0V1v AKL7v# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe41765f4c7ff4fded8814178f0231fe2d17cfd GIT binary patch literal 890 zcmV-=1BLvFP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st+(|@1R9HvFR#{II zQ53#i=sJbAw6wOBmQoPWYE)bvO#C74;(|hqHBpFyLpVY*aVB&^L z3@<+T0!D!#pZ6R{(@rL~Q_A=yU+4DBME!n`D zxQ*X@OFDqftv)%gwwM-$&*9-EnE5))+i$kdg01Pw)PYjSNQ7djvAHoh`U1&XOIhLs zErDXJD6|BMv7*otD8>R%Nv5he|5rD(1d1_-h+A+uPDfIxu5y)SLQ9|+83~_>`v6YO zwPo5Fb9WXOY#wdVRuz^NzWI@ZI2W;R=pR8W8_RpNRV>}}`1BM!S-)+IffM9Vt z5!JeC3=t==0jl}9=H+w1SjLLDQU{wbb77i)ZqdL7-W@k{6MEb!|6i7!EURF3tl2mN zbntj0J0Xcv7N{3cNiKIQ>H!Qr5g%jD0HMJz-~QVOr=HFT^WjAW8=#;6NzI^<)C?L)&7hIg3>rs>zrm`3x$-FP QwEzGB07*qoM6N<$g0W(huK)l5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png new file mode 100644 index 0000000000000000000000000000000000000000..6b7bd11e7ddec374b694b1a05b3fd094a8e691b9 GIT binary patch literal 839 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png new file mode 100644 index 0000000000000000000000000000000000000000..ad2e7f26519adac5783b2f61dabf78d2fdb4b39b GIT binary patch literal 848 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 IM6N<$f004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stlu1NER9HvFR@rXT zKoqq=;sI3BB#vV{ahj!}C9CZ$0zZrPj~Bd z(rHquQeE4`&CN7ruR}*I4l-!=g=hb$UZv;FUB1G|#na2fFfB4RpraNC7nn~!@yt)X z4xRTsde+zpZNN@nB_v!rtCMczDU&n!I_P%^JHgt#LRQh?gv2wfZqIKEeIYSB{Yb^F zGW`&Oi2dO`i{9Kd2=0UTheE&CA3b)(f z*$xLTUxQ(#piC{5$?~$p09FFaKXKdi_*N~n0l@cKv^VsY{-Y9y2F z%8V5%L7A~aB`9+V=aUZv2DfWNB`9-&v+;Y*fp4M)pg0A?Ye6L_lYt6|t@yyPX(W0< zq6ScWum#bCPyu;6iq#0-u@+QqX`J)deR<`;mx; z0UN-f@$>x(cR?&Ys$pJK!l=)ODzE|ceZ(Ka=!Q5(AumvpgWtslHh{##_Cqr&l(yJF z)FpWp*uX|A#j{8Dh($07*qoM6N<$f}aIt>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png new file mode 100644 index 0000000000000000000000000000000000000000..419132306de6c3d94dee6506b996bd2619738526 GIT binary patch literal 801 zcmV++1K#|JP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stgGod|R9HvNm)lNL zQ4oe_AKOA8UU_egX#)t{d8a;w(MSx$^9v}T$T2{S51m-*#0Yw8U< z)mJry8?T3iq4@I;{S3ii9`=(>(A`zgI}XR}I;eBDYJgaMBaacl10s85Q{5kX$yN@9 zeQ7B;0LR*|Ymoa*)=TW!{YM)UY;*Lx0dbIMIG|VQGXPz4pn(ldz{D%S%kF^Qd;*=F zlHS1TPo*&2++5K!3SeK%K$6gZ!FjMy0L|x36R?09ZEeL^TN_4NS}@+;9{4#0ur4fu zh6-j0a_sF4=K?39dnH@ZY=)YeAYLf`3?vhRGxJc0z8tK_yd0-cb4f(+`3~Z@6)kib53sxwS@@kR_>m9B8oo*ZwbK6w;ErzB zFa*hNQ-~gLL1K`iHB^-Vob)ZwB=7&c1f>wsHQos$kOAPC%P#0FZ6W@FEezm|@pc@6 z6u`O6`+#i0T!3T`P!Di*EZ!5Uj0esy=*uMp3cx#}=?-58pyO?+253EanAeq1Q91rc zl{_HvR{*|hRqXx@S3(oA3;>s1If_|}rVwckaCJP`^D!cT!#(CGHpT7U7f|mi{Ht6S zIx-Ofi1t>NR3r@8O?Zi4Z^}{|(MfGr$b!SoH_eAW{JNsAVf_jIxzAM%l_5 fqiki3(KXO6!7HEV4QcEo00000NkvXXu0mjfQaW7| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png new file mode 100644 index 0000000000000000000000000000000000000000..7414fe3efa78e86fd3c7cd46a5e515c2f5056d0e GIT binary patch literal 862 zcmV-k1EKthP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stz)3_wR9HvFRcTKX zQ52oTFa8q^8e`l@h$0}1LIs4x#JJQ@#aIXmilSh#(26a%fw+tMLH$KWmPC}TEJX_4 zDdjrnI!tQwDz(!YPjcEfZ)V;(bKiaUN_v5aq^{nl*^=RgJ<$k zEDkcT1(t?wfr*r=)0vEd9 z(M895^_`6`+>Dafx5Nhg;SeDgj++lKr{pLoYi)|g-p^!peWV8WColY3d3WgX&V6QogXrb016O<5d~ks&nKYl)NU%M-kG+6I{RA|w{#7u zCX$6xQ5qZn#$SD{qfD&>T8|)*ER>22gdZkQ2_tJU&EkMaOhnxv5))B3h{Qzv1K4}y zfO4q`$wH~90^&%-#?}JklMpSq-BHDbXrmzgzLPmbVj^-6C_l58Oy~B~^xUjkl$3Qc zhDc0ADZes@K!{&%E++G(JPNHwjWaMl@q=41gzKz_vaK4)M*xlK%gC^C27o{$%v&%sKgVrZnbs9-06+he o!bu}3oHUZcNh2woG>#004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st@<~KNR9HvFmf24e zQ541p2#ZyAi!D$}3thmn%U%n#fJhqz5-@^-1TYfW5rrraB_SrpU8BMH=!<`m4@9Fe zJ`o=bD#7Km=ZIv0OQ`8|{3Tx}J(J1z&AoH)JyIw!ABli9EgF8Ly|hK2(};5wX|hW2 zP=GvhoZm-mPGWj0({cGkHn92%9c2c^LQnvG9QlaNNlbT{9^;-&6j}|Ks5imuNLC~S z1u&(A`+dabB!-55t~C$$N9*u#+=HpcEc7%N1Ra9r-;hK;VsjERP-DiYwb%UiPo^3< z$c=ty&;hdbks$3fm1~RMDg)-*@>$QWoWw$3Rlor(sZp>S4)A>E8V@2<8wRQ+YW}PO zs?$`^X#BlT_c%ba<1pGB@%$0eG(4a6;r5Ud^XDu7X#^}$VaSiy?0QE2wjxQ5_5{!p zq~X6iT!Zyr?|B54F4hGcz!npM98Dw~u`#elhi`jMWGa{B&C~j?tGL>1;}39o#><-P ztq3>(L2qB29JlM4orXIlRr@!JrradZUO@Bzbh-&cPCZV0>;VTTN{YoXZ340*CBAN! z8Ih@6QngKo&+99ok@)uW9gjpuSw_I-`yn!wiz!Gu1b2=W9!o5`omq;R6CzW&LXOB( zu8<=#m1`Tc8PSs5{Hq8eQ@OTiEz;rZ$}*;#ETFA|W@Yyt|x9;B8m4*Xc?004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stl1W5CR9HvFR^MyW zU=$6e?b6s02I|F{q}rLYr0an%aE&5#UB~(Af}E3UhGu^Cma*V9`0U|z!w()Q z4jf3jo(+IotD8t`si_SR6sQ!+C*DIb6}6P6OZQhC4>h+c_0OJ}1Iyyy8w!du-E2Dk zV?R6wl{l$&ceh29=_mOX4nkwPU-YV6FqdlrVClPvhxM-G)ZnHW^!~RhSeGIKq#?p)}#u*GrKNqkl0e98j><=}H4$f4_`-U)!<{{5=yd z!~kAglK201a}5t$dnlPM;_8D*hz$QZ_W=(!I(XbY!q(xDjAs9uSRn>3zkDO&_cwo{ z;mx0F2FwaEz-5;P?tbe?`g{Fda6kcr*o}yRlI2SG7c%B(D6uDsrjv{T&V8nxb*BlA z^vcQcAM|9QS%f*Q?0|XZ!DZ_9N#~JU3 uV}lsr;eS#YOp?lAl2ithq%xQsq5T0!nPD|s@XEaa0000004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st%Sl8*R9HvFR#{I| zK@`4;4>lU0S}hO}6eU%bLTN2^c`$L`BEB2riW*Qf?(v@(yl&n#8hii@5q_y{@f92J8wEyO3YVG-y&<zKz|e^IA@R2OkTCMeQS z$OJ_i3YnnD2;dlyG(ta|$OJ`lGlJq!Qn-RMAaX)oyI&Ur@xTVK-6+S^wF7KK&mfEk zHgKnRm@6TU08I%}v7T*NEU*Ej-xF=W*#HU>YC`p`QQaF<8Q1_SA&L*GAIu;fqblNB zhW=+5*ueca!`z5q)i8sKh@H@*CyWO+0JOgy;T?d9s_Q{RxD~;t#z8Xx-0KT)D~1jU zw?VJgJQmmhKK>`AgJx1XXeOnDW>Pw69!dENQ7Bi?BHnMv00000NkvXXu0mjf-41o3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png new file mode 100644 index 0000000000000000000000000000000000000000..29f5f30ed598622398a7e87c52fb0621f56299bf GIT binary patch literal 858 zcmV-g1Eu_lP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9styh%hsR9HvFmfKGg zQ4q%azym^C*mk?y?rv$f+ZJd`D_229{a;i$j8IzNyX5Y(NIiA>jv?CVH#GU zlhpwj{^2eQC%a61doqooyn%uhIW$BuXJBJ#raC~y)@A3kflLf*in+r-4v&Q_TR}eL1&vk8A-j3hwY8c{!&AjF^H>OO>5}n4iGuLQ?9% zT~{}GIj03ux&kX2gcEN^f6l~6ce3uzDKF==Bb6t>>eBYb;fMYK7|2_7ZAR6!2Y@Gm z`Oj)W^kofSAa($T3u$Rayns#>Q~m;!I#lTaJcgsi4)oeFiGn+)p%MUgy&o@bV9?P} zNkyd}@M?DFG*kj$MOrbG)x|N>;8*x50oZspi_PcPB@Kk=Nh;t63Y(NWuVE4Z=6?O@ z4BkH&mma`0FbaAk><>U%Ym@5#vUCNE28)p0k>3gKyoN~t*!7tEmHQV2;`8H4Nx}bg z!-GlyD0V+~L4F7PetjDyI{~)o?Wc{?4ghtgoRMx=Ovh2on6ML#zmf%jKSybvgMOOl kpr7VB=%;xO`ez9I0X7060byj{cK`qY07*qoM6N<$f`z1b>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd43377d9d73db8fc815d47e9299c6cee65e9b4 GIT binary patch literal 768 zcmV+b1ONPqP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stVo5|nR9HvFR%=hf zFce)h8WF|@8yk#=14Pki{HXsx|Nm!=#<#{qRKy4BwdbZRT5BL~%#$3-y7ivh+uPn6 zBP?XHB>yG`+jhvZiX>qC#t1#}lrybFod|+D&Ch3qWxY7axO)GfcDqZ}YDnj=!^E5@ z6kI|SRMD?w;3J6Nh@Mg@NGuY*A569c2!Er|rt1$P->=c>^9#}TZfqwov0||#tn0-= z1`-esoV~oV6Np5)T#xO5=T#Np;sg2-YyJ~niMDyIsapvoUevLNXMRel2w3gm=*j15&x#|X#+&#UrYPRa>YOh-mG zm**`AVVr15C88>(qd_}+bo%rhRYSBF!?*Mtz~O=7gV|#nE-$ZfA(1v>K^4zk}W#pMnTIl5l2rE)_>u!ZeGtf7@eW)B}{`Zg-PVCFOTh13Q2m zK&Sq_#6XlJN-~J6AgZy=H>|0000004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9st+(|@1R9HvNmRU>_ zK^VuIhyfx9XuLrKrE&@gD7PSrs1J$?9?^IN8WTA@o{dq1ltUhr7(im8prFAQ<)$r{ z8bqE2_vkcYgcL%=aIKl+tcof}!Rjh}B5~ ze!JCI8iwAIkUw_*7Y(-*qdj%8Wq|H;{F_cVd1+N5NN zYg+?Qam3dy5QB{xw5BYy44^x$#El&*piQ0!jD5yHZam7=%ccy`vVH+xG!~t@h-vr!_EqJPB_rGOT`Cr0YzC&zgZyCj~+r6;?mT z06!krp#SJ{^k(~@F>W@7jwPagPXykSr`z;3^z{TFR;>~P7@pSQQJxA7v97@PPk5da z$2;O=w71nSTkYn^5r}ek0{s`8Ey@^yVJ*g=)IujLAQ(m&fOdn}M^Z5Wi6Fl8UqQ99AuA7wxSAP`vr%7wh&BN&ffu+FPn{Mi*LJ&S!Ll`#SbBG~;X4Hu`VK&~j>ms|`$ zwyWPC&f%vFczd50Pl5i7eNIJx69c@f+KrJDYw>gRJ!e8PB{C;Eq=@|_69c?1OGC}J zAYOfK;6ph_k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png new file mode 100644 index 0000000000000000000000000000000000000000..f32fc3f310a145b6097b57c5a0f663ef6d68c627 GIT binary patch literal 826 zcmV-A1I7G_P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stoJmAMR9HvFR#{I| zK^PqskzxV?1W`ca0+<+$QA7#2Aflp1*X zpYTDgV-_a`zNZz4ysF3Co3;4*XoYPim_Y1Wqt-EtlLF2@^r8;Y*9}O1Xu{NedyzKvK9600nyLAXWt3mSn5E8Rz3pVgKatNWzbwKJE{1>Z%cpn0nYOtfq14Iua zeX|9;CUv73OojVmXLY64*Ak<*6vpo;*{$4!Od&jV5>fBzq7vBG=0VrC)eC+zf2NC3 zP2AP*$$oK02A|hT{KXj9vw0=t^Tlc1H3!X#+r0?a-s$IRohrCEaM2g{_8QXiXb zD$D7Db7mflaTHB|C`ca60}lrw*Ikx5$FBSHe?!^|8NvyfX&CpE{iCef}Mww zd=LZdewyIgvx?oCJs}3--v$w!I3Wqp#Lqytw4)m-OV07*qoM6N<$ Ef`@E#r~m)} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png new file mode 100644 index 0000000000000000000000000000000000000000..1ca98361ec87ad7248c73f8d753a5a8ac7a56f68 GIT binary patch literal 899 zcmV-}1AP36P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000id000id0mpBs zWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9stDG$X2_+X;O5Th|9`oZ|Y7=NcRMvbosJ`zMC8nFs(d4y6Zr3Lz6 z`#Rn`v`vK}siC``^vurOeVns*XXaMX5*r(zF?_)ff^rh807|&uWvq#u9s`4YSX_Kd zI&yKQz$3p6>HY6mUz^6g&ZdT$SXudiiz9=iBNt~10BKya^Eig&&Kw@}wlu`V&~QIi zS3lBo<>E|%y<~*?QCxO4A)Eezy!r`+T=LW=g28v_?dzgv%f*=j#r!Vfu`k%!p2N7; zie9@3K1cJZ4UCSBAP{&(I&yJl6`9l)0t?Rtv*~Fh;xFqq5DHC!CmbL9{XLkUe+o|j zBry`1!PxjEgu~Ntdz@Haevdw1H%1*6(kF@Z{w8-2jr_(zCLl7<*{s0tGXGNsy3co^ zqqALl4-1_{Ma{Na3HV}!@+hO5m9hqLwAeMd!WNll4< zySVLZqj81^T^5=*g=o2lD?+0p`= z-3p`00ISV%?7mvTqojs~>CGt%H$6>aE&wZai`Ro%!J`z&s|nn&DA-M`Le2hcs5nC= zT%j(I30J5KWWp8x1+D?SEX%`&K_*;b6?Z)}E(U2cTEL`BX{ZUAaD@U~j`Qj-8iz4K z;#?aJ&u9x_fK$G{_L%x1QC5n!?8V z6NHxD&<^;OVh6g2GlYSGHjAkLelr)MSuBUXQ9MT_Ii|T0VIa2oOjJH#4L&Nvz#fT5 zX;LQiF~D`7zkgocrthD`#5pU)536GNI?W&?P?{6#f5^aNDowdKZg~yheW84vW~jbn zsjx)-wAceU{i(eu_%GVwS?y3Yz(6U)3BVmU$4i=vGlT(d{wJkDJt+<9Noi0|N`v|l Z${+VEC8=Mfb(H`B002ovPDHLkV1l2tiZcKJ literal 0 HcmV?d00001