diff --git a/src/main/java/forestry/arboriculture/models/WoodModelLoader.java b/src/main/java/forestry/arboriculture/models/WoodModelLoader.java index 65f870aae..c1c3eceb2 100644 --- a/src/main/java/forestry/arboriculture/models/WoodModelLoader.java +++ b/src/main/java/forestry/arboriculture/models/WoodModelLoader.java @@ -37,7 +37,6 @@ import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IRetexturableModel; diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java index f2ea164b2..02a801943 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java @@ -19,6 +19,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import com.mojang.authlib.GameProfile; @@ -199,7 +200,7 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt public void registerSprites() { String spriteName = getItemTexture(); TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); - textureMap.setTextureEntry(spriteName, new TextureAtlasButterfly(spriteName)); + textureMap.registerSprite(new ResourceLocation(spriteName)); } @Override diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java index 51ddc08db..331d10f82 100644 --- a/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterflyItem.java @@ -33,8 +33,8 @@ import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.ModelProcessingHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import forestry.api.lepidopterology.ButterflyManager; +import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; import forestry.core.models.BlankModel; import forestry.core.models.DefaultTextureGetter; @@ -46,7 +46,7 @@ public class ModelButterflyItem extends BlankModel { @SideOnly(Side.CLIENT) private static IModel modelButterfly; - private static final Cache cache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).build(); + private static final Cache cache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).build(); public static void onModelBake(ModelBakeEvent event){ modelButterfly = null; @@ -73,7 +73,7 @@ public class ModelButterflyItem extends BlankModel { } } IModel retexturedModel = ModelProcessingHelper.retexture(modelButterfly, textures.build()); - return new TRSRBakedModel(retexturedModel.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter), -0.03125F, 0.5F, -0.03125F, butterfly.getSize() * 1.5F); + return new TRSRBakedModel(retexturedModel.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter), -0.03125F, 0.25F - butterfly.getSize() * 0.37F, -0.03125F, butterfly.getSize() * 1.5F); } private class ButterflyItemOverrideList extends ItemOverrideList { @@ -87,10 +87,13 @@ public class ModelButterflyItem extends BlankModel { if (butterfly == null) { butterfly = ButterflyManager.butterflyRoot.templateAsIndividual(ButterflyManager.butterflyRoot.getDefaultTemplate()); } - if(cache.getIfPresent(butterfly) == null){ - cache.put(butterfly, bakeModel(butterfly)); + IAlleleButterflySpecies primary = butterfly.getGenome().getPrimary(); + IBakedModel bakedModel = cache.getIfPresent(primary); + if(bakedModel == null){ + bakedModel = bakeModel(butterfly); + cache.put(primary, bakedModel); } - return cache.getIfPresent(butterfly); + return bakedModel; } } } diff --git a/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java b/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java deleted file mode 100644 index 904b3bc37..000000000 --- a/src/main/java/forestry/lepidopterology/render/TextureAtlasButterfly.java +++ /dev/null @@ -1,59 +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 com.google.common.collect.Lists; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; - -public class TextureAtlasButterfly extends TextureAtlasSprite { - - public TextureAtlasButterfly(String spriteName) { - super(spriteName); - } - -// TODO: fix butterfly sprite -// @Override -// public void loadSprite(BufferedImage[] images, AnimationMetadataSection meta) throws IOException { -// this.resetSprite(); -// int i = images[0].getWidth(); -// int j = images[0].getHeight(); -// this.width = i; -// this.height = j; -// int[][] aint = new int[images.length][]; -// -// for (int k = 0; k < images.length; ++k) { -// BufferedImage bufferedimage = images[k]; -// -// if (bufferedimage != null) { -// if (k > 0 && (bufferedimage.getWidth() != i >> k || bufferedimage.getHeight() != j >> k)) { -// throw new RuntimeException(String.format("Unable to load miplevel: %d, image is size: %dx%d, expected %dx%d", new Object[]{Integer.valueOf(k), Integer.valueOf(bufferedimage.getWidth()), Integer.valueOf(bufferedimage.getHeight()), Integer.valueOf(i >> k), Integer.valueOf(j >> k)})); -// } -// -// aint[k] = new int[bufferedimage.getWidth() * bufferedimage.getHeight()]; -// bufferedimage.getRGB(0, 0, bufferedimage.getWidth(), bufferedimage.getHeight(), aint[k], 0, bufferedimage.getWidth()); -// } -// } -// this.framesTextureData.add(aint); -// } - - private void resetSprite() { - this.setFramesTextureData(Lists.newArrayList()); - this.frameCounter = 0; - this.tickCounter = 0; - } - - @Override - public boolean hasAnimationMetadata() { - return false; - } - -} diff --git a/src/main/resources/assets/forestry/models/item/butterflyGE.json b/src/main/resources/assets/forestry/models/item/butterflyGE.json index 3157421d8..074f729fd 100644 --- a/src/main/resources/assets/forestry/models/item/butterflyGE.json +++ b/src/main/resources/assets/forestry/models/item/butterflyGE.json @@ -1,102 +1,93 @@ { -"elements": [ -{ - "from": [ 0.5, 13, 1 ], - "to": [ 7.5, 14, 13.5 ], - "faces": { - "down": { "uv": [ 3.5, 0, 7, 6.5 ], "texture": "#butterfly" }, - "up": { "uv": [ 0, 0, 3.5, 6.5 ], "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" } - } -}, -{ - "from": [ 8.5, 13, 1 ], - "to": [ 15.5, 14, 13.5 ], - "faces": { - "down": { "uv": [ 3.5, 7, 7, 13.5 ], "texture": "#butterfly" }, - "up": { "uv": [ 0, 7, 3.5, 13.5 ], "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" } - } -}, -{ - "from": [ 7.3125, 13, 3.5 ], - "to": [ 8.3125, 14, 9.5 ], - "rotation": { "origin": [ 7.3125, 14, 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" } - } -}, -{ - "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" } - } -}, -{ - "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_righthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, -2.65, 2.46 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, -2.65, 2.46 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "scale": [ 0.5, 0.5, 0.5 ], - "translation": [ 0, -4, 0 ] - }, - "fixed": { - "rotation": [ -90, -180, 0 ], - "translation": [ 0, 0.5, 12.41 ], - "scale": [ 1, 1, 1 ] - }, - "firstperson_righthand": { - "rotation": [ 21, 0, 0 ], - "translation": [ -0.25, -0.76, 0.76 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "firstperson_lefthand": { - "rotation": [ 21, 0, 0 ], - "translation": [ -0.25, -0.76, 0.76 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "gui": { - "rotation": [ 90, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - } -} + "elements": [ + { + "from": [ 0.5, 14, 1 ], + "to": [ 7.5, 14.001, 13.5 ], + "faces": { + "down": { "uv": [ 0, 0, 7, 13 ], "texture": "#butterfly" }, + "up": { "uv": [ 9, 0, 16, 13 ], "texture": "#butterfly", "rotation": 180 } + } + }, + { + "from": [ 8.5, 14, 1 ], + "to": [ 15.5, 14.001, 13.5 ], + "faces": { + "down": { "uv": [ 9, 0, 16, 13 ], "texture": "#butterfly" }, + "up": { "uv": [ 0, 0, 7, 13 ], "texture": "#butterfly", "rotation": 180 } + } + }, + { + "from": [ 7.3123, 13, 3.5 ], + "to": [ 8.3123, 14, 9.5 ], + "rotation": { "origin": [ 7.3125, 14, 3.5 ], "axis": "z", "angle": 45 }, + "faces": { + "down": { "uv": [ 7, 7, 8, 13 ], "texture": "#butterfly" }, + "up": { "uv": [ 8, 7, 9, 13 ], "texture": "#butterfly" }, + "north": { "uv": [ 7, 13, 8, 14 ], "texture": "#butterfly" }, + "south": { "uv": [ 14, 13, 15, 14 ], "texture": "#butterfly" }, + "west": { "uv": [ 1, 13, 7, 14 ], "texture": "#butterfly" }, + "east": { "uv": [ 8, 13, 14, 14 ], "texture": "#butterfly" } + } + }, + { + "from": [ 6.9, 14, 3 ], + "to": [ 7.9, 15, 4 ], + "faces": { + "down": { "uv": [ 12, 15, 11, 14 ], "texture": "#butterfly" }, + "up": { "uv": [ 12, 14, 13, 15 ], "texture": "#butterfly" }, + "north": { "uv": [ 11, 15, 12, 16 ], "texture": "#butterfly" }, + "south": { "uv": [ 13, 15, 14, 16 ], "texture": "#butterfly" }, + "west": { "uv": [ 12, 15, 13, 16 ], "texture": "#butterfly" }, + "east": { "uv": [ 10, 15, 11, 16 ], "texture": "#butterfly" } + } + }, + { + "from": [ 8.099999, 14, 2.9375 ], + "to": [ 9.099999, 15, 3.9375 ], + "faces": { + "down": { "uv": [ 3, 14, 4, 15 ], "texture": "#butterfly" }, + "up": { "uv": [ 4, 14, 5, 15 ], "texture": "#butterfly" }, + "north": { "uv": [ 3, 15, 4, 16 ], "texture": "#butterfly" }, + "south": { "uv": [ 5, 15, 6, 16 ], "texture": "#butterfly" }, + "west": { "uv": [ 4, 15, 5, 16 ], "texture": "#butterfly" }, + "east": { "uv": [ 2, 15, 3, 16 ], "texture": "#butterfly" } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ 0, -2.65, 2.46 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_lefthand": { + "translation": [ 0, -2.65, 2.46 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson_righthand": { + "rotation": [ 21, 0, 0 ], + "translation": [ -0.25, -0.76, 0.76 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson_lefthand": { + "rotation": [ 21, 0, 0 ], + "translation": [ -0.25, -0.76, 0.76 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "gui": { + "rotation": [ 90, 0, 3 ], + "translation": [ 0.4, -1.053, 0 ], + "scale": [ 0.65, 0.65, 0.65 ] + }, + "head": { + "translation": [ 0, 2.5, 0 ] + }, + "ground": { + "translation": [ 0, -4, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 90, 0, -180 ], + "translation": [ 0, 0, 6.2608 ] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png index 4cfe7c165..e7a8edd3d 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiAurora.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png index 127887b1d..d0de48c4e 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBatesia.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png index 6dd53cffa..fd3ed6ce7 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlackSwallow.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png index ce37498f1..e57cabbd1 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueDuke.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png index fd53a537d..fe3d7779f 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBlueWing.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png index 250f647e4..7b0e5905c 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiBrimstone.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png index d6013c997..86c9035e1 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCSpeckledWood.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png index 57b542af1..4877e8fdc 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCabbageWhite.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png index 063dc4427..8401ede20 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiCitrusSwallow.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png index 3d77268f4..ab3eedb82 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiComma.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png index 1fe9b952f..9e53dd256 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiDianaFrit.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png index 6e8add6e1..0bf0ab2fe 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiEmeraldPeacock.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png index ae1386c30..7655da4a1 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlasswing.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png index 37151b59e..62092c09b 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGlassyTiger.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png index 185926c2e..b006c6beb 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiGozoraAzure.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png index ebe41765f..d240c6331 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiLLacewing.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png index 6b7bd11e7..0e8c91c4e 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMBlueMorpho.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png index 645de51cb..9d4951785 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMSpeckledWood.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png index 4de9c8db3..a1f823090 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMalachite.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png index ad2e7f265..4b6fd9d00 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiMonarch.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png index a88458e99..9fa73a65e 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPBlueMorpho.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png index 850c9cf74..7711e9760 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPalaenoSulphur.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png index b8fef34c1..6a6304c2f 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostillion.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png index fc069bd4e..45e3555aa 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiPostman.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png index 419132306..9c1655993 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiRBlueMorpho.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png index 7414fe3ef..192a9b26a 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiReseda.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png index 6ee6a16aa..fffa836d6 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpeckledWood.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png index a1f7bceef..f8d02a9a6 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpicebush.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png index 96ef89ac6..c79f9e5b9 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiSpringAzure.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png index 29f5f30ed..b7ef8c7a5 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiThoasSwallow.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png b/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png index 1fd43377d..6027892c3 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png and b/src/main/resources/assets/forestry/textures/items/butterflies/lepiZebraSwallow.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png index 58a1af361..d22636dc0 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png and b/src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png index 57007c877..2a290470b 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png and b/src/main/resources/assets/forestry/textures/items/butterflies/mothBombyxMori.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png index f32fc3f31..e8a3222c0 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png and b/src/main/resources/assets/forestry/textures/items/butterflies/mothBrimstone.png differ diff --git a/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png b/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png index 1ca98361e..c8a88f00c 100644 Binary files a/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png and b/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png differ