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 40fbfd588..000000000 Binary files a/src/main/resources/assets/forestry/models/item/butterflyGE.b3d and /dev/null differ 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 000000000..4cfe7c165 Binary files /dev/null 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 new file mode 100644 index 000000000..127887b1d Binary files /dev/null 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 new file mode 100644 index 000000000..6dd53cffa Binary files /dev/null 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 new file mode 100644 index 000000000..ce37498f1 Binary files /dev/null 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 new file mode 100644 index 000000000..fd53a537d Binary files /dev/null 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 new file mode 100644 index 000000000..250f647e4 Binary files /dev/null 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 new file mode 100644 index 000000000..d6013c997 Binary files /dev/null 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 new file mode 100644 index 000000000..57b542af1 Binary files /dev/null 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 new file mode 100644 index 000000000..063dc4427 Binary files /dev/null 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 new file mode 100644 index 000000000..3d77268f4 Binary files /dev/null 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 new file mode 100644 index 000000000..1fe9b952f Binary files /dev/null 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 new file mode 100644 index 000000000..6e8add6e1 Binary files /dev/null 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 new file mode 100644 index 000000000..ae1386c30 Binary files /dev/null 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 new file mode 100644 index 000000000..37151b59e Binary files /dev/null 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 new file mode 100644 index 000000000..185926c2e Binary files /dev/null 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 new file mode 100644 index 000000000..ebe41765f Binary files /dev/null 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 new file mode 100644 index 000000000..6b7bd11e7 Binary files /dev/null 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 new file mode 100644 index 000000000..645de51cb Binary files /dev/null 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 new file mode 100644 index 000000000..4de9c8db3 Binary files /dev/null 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 new file mode 100644 index 000000000..ad2e7f265 Binary files /dev/null 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 new file mode 100644 index 000000000..a88458e99 Binary files /dev/null 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 new file mode 100644 index 000000000..850c9cf74 Binary files /dev/null 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 new file mode 100644 index 000000000..b8fef34c1 Binary files /dev/null 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 new file mode 100644 index 000000000..fc069bd4e Binary files /dev/null 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 new file mode 100644 index 000000000..419132306 Binary files /dev/null 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 new file mode 100644 index 000000000..7414fe3ef Binary files /dev/null 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 new file mode 100644 index 000000000..6ee6a16aa Binary files /dev/null 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 new file mode 100644 index 000000000..a1f7bceef Binary files /dev/null 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 new file mode 100644 index 000000000..96ef89ac6 Binary files /dev/null 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 new file mode 100644 index 000000000..29f5f30ed Binary files /dev/null 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 new file mode 100644 index 000000000..1fd43377d Binary files /dev/null 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 new file mode 100644 index 000000000..58a1af361 Binary files /dev/null and b/src/main/resources/assets/forestry/textures/items/butterflies/mothAtlas.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 new file mode 100644 index 000000000..f32fc3f31 Binary files /dev/null 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 new file mode 100644 index 000000000..1ca98361e Binary files /dev/null and b/src/main/resources/assets/forestry/textures/items/butterflies/mothLatticedHeath.png differ