From 3cfc15887544d86592f981c092b059d67d4bb55c Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 29 Apr 2016 21:02:13 +0200 Subject: [PATCH] Move Icon sprites in to the gui folder and particles sprites in to the entity folder and Fix #1143 --- .../forestry/apiculture/PluginApiculture.java | 4 ++- .../apiculture/entities/EntityFXBee.java | 4 +++ .../genetics/alleles/AlleleEffect.java | 2 +- .../forestry/core/errors/EnumErrorCode.java | 3 +- .../core/errors/ErrorAtlasSprite.java | 28 ++++++++++++++++++ .../core/gui/ledgers/ErrorLedger.java | 1 + .../java/forestry/core/proxy/ProxyRender.java | 2 +- .../core/proxy/ProxyRenderClient.java | 4 +-- .../forestry/core/render/TextureManager.java | 10 +++++-- .../java/forestry/core/triggers/Trigger.java | 2 +- .../{items => entity}/particles/snow.1.png | Bin .../{items => entity}/particles/snow.2.png | Bin .../{items => entity}/particles/snow.3.png | Bin .../{items => entity}/particles/swarm_bee.png | Bin .../{items => gui}/analyzer/anything.png | Bin .../textures/{items => gui}/analyzer/bee.png | Bin .../textures/{items => gui}/analyzer/cave.png | Bin .../{items => gui}/analyzer/closed.png | Bin .../{items => gui}/analyzer/drone.png | Bin .../{items => gui}/analyzer/flyer.png | Bin .../textures/{items => gui}/analyzer/item.png | Bin .../{items => gui}/analyzer/nocturnal.png | Bin .../{items => gui}/analyzer/princess.png | Bin .../{items => gui}/analyzer/pure_breed.png | Bin .../{items => gui}/analyzer/pure_cave.png | Bin .../{items => gui}/analyzer/pure_flyer.png | Bin .../analyzer/pure_nocturnal.png | Bin .../{items => gui}/analyzer/queen.png | Bin .../{items => gui}/errors/circuitMismatch.png | Bin .../{items => gui}/errors/disabled.png | Bin .../{items => gui}/errors/errored.png | Bin .../{items => gui}/errors/forcedCooldown.png | Bin .../{items => gui}/errors/invalidBiome.png | Bin .../{items => gui}/errors/isRaining.png | Bin .../{items => gui}/errors/noCircuitBoard.png | Bin .../{items => gui}/errors/noCircuitLayout.png | Bin .../{items => gui}/errors/noDisposal.png | Bin .../{items => gui}/errors/noDrone.png | Bin .../{items => gui}/errors/noEnergyNet.png | Bin .../{items => gui}/errors/noFarmland.png | Bin .../{items => gui}/errors/noFertilizer.png | Bin .../{items => gui}/errors/noFlower.png | Bin .../textures/{items => gui}/errors/noFuel.png | Bin .../textures/{items => gui}/errors/noHeat.png | Bin .../{items => gui}/errors/noHoney.png | Bin .../{items => gui}/errors/noLiquid.png | Bin .../{items => gui}/errors/noPaper.png | Bin .../{items => gui}/errors/noPower.png | Bin .../{items => gui}/errors/noQueen.png | Bin .../{items => gui}/errors/noRecipe.png | Bin .../{items => gui}/errors/noRecipient.png | Bin .../{items => gui}/errors/noResource.png | Bin .../textures/{items => gui}/errors/noSky.png | Bin .../{items => gui}/errors/noSpace.png | Bin .../{items => gui}/errors/noSpecimen.png | Bin .../{items => gui}/errors/noStamps.png | Bin .../{items => gui}/errors/notAlphaNumeric.png | Bin .../textures/{items => gui}/errors/notDay.png | Bin .../{items => gui}/errors/notGloomy.png | Bin .../{items => gui}/errors/notLucid.png | Bin .../{items => gui}/errors/notNight.png | Bin .../{items => gui}/errors/notRaining.png | Bin .../{items => gui}/errors/notUnique.png | Bin .../textures/{items => gui}/errors/ok.png | Bin .../{items => gui}/errors/tooCold.png | Bin .../textures/{items => gui}/errors/tooHot.png | Bin .../{items => gui}/errors/tooHumid.png | Bin .../{items => gui}/errors/unknown.png | Bin .../{items => gui}/errors/wrongStacksize.png | Bin .../{items => gui}/habitats/desert.png | Bin .../textures/{items => gui}/habitats/end.png | Bin .../{items => gui}/habitats/forest.png | Bin .../{items => gui}/habitats/hills.png | Bin .../{items => gui}/habitats/jungle.png | Bin .../{items => gui}/habitats/mushroom.png | Bin .../{items => gui}/habitats/nether.png | Bin .../{items => gui}/habitats/ocean.png | Bin .../{items => gui}/habitats/plains.png | Bin .../textures/{items => gui}/habitats/snow.png | Bin .../{items => gui}/habitats/swamp.png | Bin .../{items => gui}/habitats/taiga.png | Bin .../{items => gui}/mail/carrier.player.png | Bin .../{items => gui}/mail/carrier.trader.png | Bin .../{items => gui}/misc/access.private.png | Bin .../{items => gui}/misc/access.shared.png | Bin .../{items => gui}/misc/access.viewable.png | Bin .../textures/{items => gui}/misc/energy.png | Bin .../textures/{items => gui}/misc/hint.png | Bin .../textures/{items => gui}/slots/blocked.png | Bin .../{items => gui}/slots/blocked_2.png | Bin .../{items => gui}/slots/container.png | Bin .../textures/{items => gui}/slots/liquid.png | Bin .../textures/{items => gui}/slots/locked.png | Bin .../{items => gui}/triggers/hasMail.png | Bin .../{items => gui}/triggers/hasWork.png | Bin .../{items => gui}/triggers/lowFertilizer.png | Bin .../{items => gui}/triggers/lowFuel.png | Bin .../{items => gui}/triggers/lowGermlings.png | Bin .../{items => gui}/triggers/lowInput.png | Bin .../{items => gui}/triggers/lowLiquid.png | Bin .../{items => gui}/triggers/lowPaper.png | Bin .../{items => gui}/triggers/lowResources.png | Bin .../{items => gui}/triggers/lowSoil.png | Bin .../{items => gui}/triggers/lowStamps.png | Bin .../{items => gui}/triggers/mailBuffer.png | Bin .../{items => gui}/triggers/missingDrone.png | Bin .../{items => gui}/triggers/missingQueen.png | Bin .../{items => gui}/triggers/noFrames.png | Bin 108 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 src/main/java/forestry/core/errors/ErrorAtlasSprite.java rename src/main/resources/assets/forestry/textures/{items => entity}/particles/snow.1.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => entity}/particles/snow.2.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => entity}/particles/snow.3.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => entity}/particles/swarm_bee.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/anything.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/bee.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/cave.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/closed.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/drone.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/flyer.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/item.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/nocturnal.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/princess.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/pure_breed.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/pure_cave.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/pure_flyer.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/pure_nocturnal.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/analyzer/queen.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/circuitMismatch.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/disabled.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/errored.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/forcedCooldown.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/invalidBiome.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/isRaining.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noCircuitBoard.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noCircuitLayout.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noDisposal.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noDrone.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noEnergyNet.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noFarmland.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noFertilizer.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noFlower.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noFuel.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noHeat.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noHoney.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noLiquid.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noPaper.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noPower.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noQueen.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noRecipe.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noRecipient.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noResource.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noSky.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noSpace.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noSpecimen.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/noStamps.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notAlphaNumeric.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notDay.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notGloomy.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notLucid.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notNight.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notRaining.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/notUnique.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/ok.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/tooCold.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/tooHot.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/tooHumid.png (100%) rename src/main/resources/assets/forestry/textures/{items => gui}/errors/unknown.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/errors/wrongStacksize.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/desert.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/end.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/forest.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/hills.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/jungle.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/mushroom.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/nether.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/ocean.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/plains.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/snow.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/swamp.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/habitats/taiga.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/mail/carrier.player.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/mail/carrier.trader.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/misc/access.private.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/misc/access.shared.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/misc/access.viewable.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/misc/energy.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/misc/hint.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/slots/blocked.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/slots/blocked_2.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/slots/container.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/slots/liquid.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/slots/locked.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/hasMail.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/hasWork.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowFertilizer.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowFuel.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowGermlings.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowInput.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowLiquid.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowPaper.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowResources.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowSoil.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/lowStamps.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/mailBuffer.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/missingDrone.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/missingQueen.png (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/{items => gui}/triggers/noFrames.png (100%) mode change 100755 => 100644 diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 0e0d5fd74..90d330abb 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -70,6 +70,7 @@ import forestry.apiculture.blocks.BlockRegistryApiculture; import forestry.apiculture.blocks.BlockTypeApiculture; import forestry.apiculture.blocks.BlockTypeApicultureTesr; import forestry.apiculture.commands.CommandBee; +import forestry.apiculture.entities.EntityFXBee; import forestry.apiculture.entities.EntityMinecartApiary; import forestry.apiculture.entities.EntityMinecartBeehouse; import forestry.apiculture.flowers.Flower; @@ -948,8 +949,9 @@ public class PluginApiculture extends BlankForestryPlugin { public void textureHook(TextureStitchEvent.Pre event) { EntityFXSnow.sprites = new TextureAtlasSprite[3]; for (int i = 0; i < EntityFXSnow.sprites.length; i++) { - EntityFXSnow.sprites[i] = event.map.registerSprite(new ResourceLocation("forestry:items/particles/snow." + (i + 1))); + EntityFXSnow.sprites[i] = event.map.registerSprite(new ResourceLocation("forestry:entity/particles/snow." + (i + 1))); } + EntityFXBee.beeSprite = event.map.registerSprite(new ResourceLocation("forestry:entity/particles/swarm_bee")); ItemHabitatLocator.registerSprite(); } diff --git a/src/main/java/forestry/apiculture/entities/EntityFXBee.java b/src/main/java/forestry/apiculture/entities/EntityFXBee.java index 7a681f30a..18363b8ae 100644 --- a/src/main/java/forestry/apiculture/entities/EntityFXBee.java +++ b/src/main/java/forestry/apiculture/entities/EntityFXBee.java @@ -12,15 +12,19 @@ package forestry.apiculture.entities; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.world.World; public class EntityFXBee extends EntityFX { private final double originX; private final double originZ; + + public static TextureAtlasSprite beeSprite; public EntityFXBee(World world, double x, double y, double z, int color) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); + setParticleIcon(beeSprite); this.originX = x; this.originZ = z; diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java index 7e4d55dc5..7442e3559 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java @@ -104,7 +104,7 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB @Override public IEffectData doFX(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) { Vec3 beeFXCoordinates = housing.getBeeFXCoordinates(); - Proxies.render.addBeeHiveFX("particles/swarm_bee", housing.getWorld(), beeFXCoordinates.xCoord, beeFXCoordinates.yCoord, beeFXCoordinates.zCoord, genome.getPrimary().getSpriteColour(0)); + Proxies.render.addBeeHiveFX(housing.getWorld(), beeFXCoordinates.xCoord, beeFXCoordinates.yCoord, beeFXCoordinates.zCoord, genome.getPrimary().getSpriteColour(0)); return storedData; } diff --git a/src/main/java/forestry/core/errors/EnumErrorCode.java b/src/main/java/forestry/core/errors/EnumErrorCode.java index e95feb5c4..768285feb 100644 --- a/src/main/java/forestry/core/errors/EnumErrorCode.java +++ b/src/main/java/forestry/core/errors/EnumErrorCode.java @@ -111,7 +111,8 @@ public enum EnumErrorCode implements IErrorState { @SideOnly(Side.CLIENT) @Override public void registerSprite() { - texture = TextureManager.registerSprite("items/errors/" + iconName); + String location = "forestry:gui/errors/" + iconName; + texture = TextureManager.registerSprite(new ErrorAtlasSprite(location), location); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/core/errors/ErrorAtlasSprite.java b/src/main/java/forestry/core/errors/ErrorAtlasSprite.java new file mode 100644 index 000000000..5f9cc16ed --- /dev/null +++ b/src/main/java/forestry/core/errors/ErrorAtlasSprite.java @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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.core.errors; + +import java.awt.image.BufferedImage; +import java.io.IOException; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.data.AnimationMetadataSection; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ErrorAtlasSprite extends TextureAtlasSprite { + + public ErrorAtlasSprite(String spriteName) { + super(spriteName); + } + +} diff --git a/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java b/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java index 49dab677a..4acedb4bd 100644 --- a/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java +++ b/src/main/java/forestry/core/gui/ledgers/ErrorLedger.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import forestry.api.core.IErrorState; import forestry.core.utils.StringUtil; +import net.minecraft.client.renderer.GlStateManager; /** * A ledger displaying error messages and help text. diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index f1a2a4b5b..0b76d9b11 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -109,7 +109,7 @@ public class ProxyRender { /* FX */ - public void addBeeHiveFX(String texture, World world, double x, double y, double z, int color) { + public void addBeeHiveFX(World world, double x, double y, double z, int color) { } public void addEntityHoneyDustFX(World world, double x, double y, double z) { diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 7cb0727da..4566f0580 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -194,14 +194,12 @@ public class ProxyRenderClient extends ProxyRender { } @Override - public void addBeeHiveFX(String icon, World world, double x, double y, double z, int color) { + public void addBeeHiveFX(World world, double x, double y, double z, int color) { if (!shouldSpawnParticle(world)) { return; } EntityFX fx = new EntityFXBee(world, x, y, z, color); - TextureAtlasSprite sprite = TextureManager.getInstance().getDefault(icon); - fx.setParticleIcon(sprite); ParticleRenderer.getInstance().addEffect(fx); } diff --git a/src/main/java/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java index 05bb22de6..e9c95202d 100755 --- a/src/main/java/forestry/core/render/TextureManager.java +++ b/src/main/java/forestry/core/render/TextureManager.java @@ -55,11 +55,11 @@ public class TextureManager implements ITextureManager { "analyzer/anything", "analyzer/bee", "analyzer/cave", "analyzer/closed", "analyzer/drone", "analyzer/flyer", "analyzer/item", "analyzer/nocturnal", "analyzer/princess", "analyzer/pure_breed", "analyzer/pure_cave", "analyzer/pure_flyer", "analyzer/pure_nocturnal", "analyzer/queen", - "particles/swarm_bee", "errors/errored", "errors/unknown", + "errors/errored", "errors/unknown", "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader"}; for (String str : defaultIconNames) { - TextureAtlasSprite icon = registerSprite("items/" + str); + TextureAtlasSprite icon = registerSprite("gui/" + str); defaultIcons.put(str, icon); } } @@ -69,6 +69,12 @@ public class TextureManager implements ITextureManager { return map.registerSprite(new ResourceLocation("forestry:" + identifier)); } + public static TextureAtlasSprite registerSprite(TextureAtlasSprite sprite, String identifier) { + TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); + map.setTextureEntry(identifier, sprite); + return sprite; + } + public static TextureAtlasSprite getSprite(String modID, String identifier) { TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); if (map.getAtlasSprite(new ResourceLocation(modID + ":" + identifier).toString()) == map.getMissingSprite()) { diff --git a/src/main/java/forestry/core/triggers/Trigger.java b/src/main/java/forestry/core/triggers/Trigger.java index 991f089d1..b701b2ec2 100755 --- a/src/main/java/forestry/core/triggers/Trigger.java +++ b/src/main/java/forestry/core/triggers/Trigger.java @@ -67,7 +67,7 @@ public abstract class Trigger implements ITriggerExternal { private TextureAtlasSprite icon; @SideOnly(Side.CLIENT) - public void registerIcons() { + public void registerSprites() { icon = TextureManager.registerSprite("triggers/" + unlocalized.replace("trigger.", "")); } diff --git a/src/main/resources/assets/forestry/textures/items/particles/snow.1.png b/src/main/resources/assets/forestry/textures/entity/particles/snow.1.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/particles/snow.1.png rename to src/main/resources/assets/forestry/textures/entity/particles/snow.1.png diff --git a/src/main/resources/assets/forestry/textures/items/particles/snow.2.png b/src/main/resources/assets/forestry/textures/entity/particles/snow.2.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/particles/snow.2.png rename to src/main/resources/assets/forestry/textures/entity/particles/snow.2.png diff --git a/src/main/resources/assets/forestry/textures/items/particles/snow.3.png b/src/main/resources/assets/forestry/textures/entity/particles/snow.3.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/particles/snow.3.png rename to src/main/resources/assets/forestry/textures/entity/particles/snow.3.png diff --git a/src/main/resources/assets/forestry/textures/items/particles/swarm_bee.png b/src/main/resources/assets/forestry/textures/entity/particles/swarm_bee.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/particles/swarm_bee.png rename to src/main/resources/assets/forestry/textures/entity/particles/swarm_bee.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/anything.png b/src/main/resources/assets/forestry/textures/gui/analyzer/anything.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/anything.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/anything.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/bee.png b/src/main/resources/assets/forestry/textures/gui/analyzer/bee.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/bee.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/bee.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/cave.png b/src/main/resources/assets/forestry/textures/gui/analyzer/cave.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/cave.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/cave.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/closed.png b/src/main/resources/assets/forestry/textures/gui/analyzer/closed.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/closed.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/closed.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/drone.png b/src/main/resources/assets/forestry/textures/gui/analyzer/drone.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/drone.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/drone.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/flyer.png b/src/main/resources/assets/forestry/textures/gui/analyzer/flyer.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/flyer.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/flyer.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/item.png b/src/main/resources/assets/forestry/textures/gui/analyzer/item.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/item.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/item.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/nocturnal.png b/src/main/resources/assets/forestry/textures/gui/analyzer/nocturnal.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/nocturnal.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/nocturnal.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/princess.png b/src/main/resources/assets/forestry/textures/gui/analyzer/princess.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/princess.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/princess.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/pure_breed.png b/src/main/resources/assets/forestry/textures/gui/analyzer/pure_breed.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/pure_breed.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/pure_breed.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/pure_cave.png b/src/main/resources/assets/forestry/textures/gui/analyzer/pure_cave.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/pure_cave.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/pure_cave.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/pure_flyer.png b/src/main/resources/assets/forestry/textures/gui/analyzer/pure_flyer.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/pure_flyer.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/pure_flyer.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/pure_nocturnal.png b/src/main/resources/assets/forestry/textures/gui/analyzer/pure_nocturnal.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/pure_nocturnal.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/pure_nocturnal.png diff --git a/src/main/resources/assets/forestry/textures/items/analyzer/queen.png b/src/main/resources/assets/forestry/textures/gui/analyzer/queen.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/analyzer/queen.png rename to src/main/resources/assets/forestry/textures/gui/analyzer/queen.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/circuitMismatch.png b/src/main/resources/assets/forestry/textures/gui/errors/circuitMismatch.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/circuitMismatch.png rename to src/main/resources/assets/forestry/textures/gui/errors/circuitMismatch.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/disabled.png b/src/main/resources/assets/forestry/textures/gui/errors/disabled.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/disabled.png rename to src/main/resources/assets/forestry/textures/gui/errors/disabled.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/errored.png b/src/main/resources/assets/forestry/textures/gui/errors/errored.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/errored.png rename to src/main/resources/assets/forestry/textures/gui/errors/errored.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/forcedCooldown.png b/src/main/resources/assets/forestry/textures/gui/errors/forcedCooldown.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/forcedCooldown.png rename to src/main/resources/assets/forestry/textures/gui/errors/forcedCooldown.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/invalidBiome.png b/src/main/resources/assets/forestry/textures/gui/errors/invalidBiome.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/invalidBiome.png rename to src/main/resources/assets/forestry/textures/gui/errors/invalidBiome.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/isRaining.png b/src/main/resources/assets/forestry/textures/gui/errors/isRaining.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/isRaining.png rename to src/main/resources/assets/forestry/textures/gui/errors/isRaining.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noCircuitBoard.png b/src/main/resources/assets/forestry/textures/gui/errors/noCircuitBoard.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noCircuitBoard.png rename to src/main/resources/assets/forestry/textures/gui/errors/noCircuitBoard.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png b/src/main/resources/assets/forestry/textures/gui/errors/noCircuitLayout.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noCircuitLayout.png rename to src/main/resources/assets/forestry/textures/gui/errors/noCircuitLayout.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noDisposal.png b/src/main/resources/assets/forestry/textures/gui/errors/noDisposal.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noDisposal.png rename to src/main/resources/assets/forestry/textures/gui/errors/noDisposal.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noDrone.png b/src/main/resources/assets/forestry/textures/gui/errors/noDrone.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noDrone.png rename to src/main/resources/assets/forestry/textures/gui/errors/noDrone.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noEnergyNet.png b/src/main/resources/assets/forestry/textures/gui/errors/noEnergyNet.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noEnergyNet.png rename to src/main/resources/assets/forestry/textures/gui/errors/noEnergyNet.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noFarmland.png b/src/main/resources/assets/forestry/textures/gui/errors/noFarmland.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noFarmland.png rename to src/main/resources/assets/forestry/textures/gui/errors/noFarmland.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noFertilizer.png b/src/main/resources/assets/forestry/textures/gui/errors/noFertilizer.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noFertilizer.png rename to src/main/resources/assets/forestry/textures/gui/errors/noFertilizer.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noFlower.png b/src/main/resources/assets/forestry/textures/gui/errors/noFlower.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noFlower.png rename to src/main/resources/assets/forestry/textures/gui/errors/noFlower.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noFuel.png b/src/main/resources/assets/forestry/textures/gui/errors/noFuel.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noFuel.png rename to src/main/resources/assets/forestry/textures/gui/errors/noFuel.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noHeat.png b/src/main/resources/assets/forestry/textures/gui/errors/noHeat.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noHeat.png rename to src/main/resources/assets/forestry/textures/gui/errors/noHeat.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noHoney.png b/src/main/resources/assets/forestry/textures/gui/errors/noHoney.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noHoney.png rename to src/main/resources/assets/forestry/textures/gui/errors/noHoney.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noLiquid.png b/src/main/resources/assets/forestry/textures/gui/errors/noLiquid.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noLiquid.png rename to src/main/resources/assets/forestry/textures/gui/errors/noLiquid.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noPaper.png b/src/main/resources/assets/forestry/textures/gui/errors/noPaper.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noPaper.png rename to src/main/resources/assets/forestry/textures/gui/errors/noPaper.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noPower.png b/src/main/resources/assets/forestry/textures/gui/errors/noPower.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noPower.png rename to src/main/resources/assets/forestry/textures/gui/errors/noPower.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noQueen.png b/src/main/resources/assets/forestry/textures/gui/errors/noQueen.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noQueen.png rename to src/main/resources/assets/forestry/textures/gui/errors/noQueen.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noRecipe.png b/src/main/resources/assets/forestry/textures/gui/errors/noRecipe.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noRecipe.png rename to src/main/resources/assets/forestry/textures/gui/errors/noRecipe.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noRecipient.png b/src/main/resources/assets/forestry/textures/gui/errors/noRecipient.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noRecipient.png rename to src/main/resources/assets/forestry/textures/gui/errors/noRecipient.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noResource.png b/src/main/resources/assets/forestry/textures/gui/errors/noResource.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noResource.png rename to src/main/resources/assets/forestry/textures/gui/errors/noResource.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noSky.png b/src/main/resources/assets/forestry/textures/gui/errors/noSky.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noSky.png rename to src/main/resources/assets/forestry/textures/gui/errors/noSky.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noSpace.png b/src/main/resources/assets/forestry/textures/gui/errors/noSpace.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noSpace.png rename to src/main/resources/assets/forestry/textures/gui/errors/noSpace.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noSpecimen.png b/src/main/resources/assets/forestry/textures/gui/errors/noSpecimen.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noSpecimen.png rename to src/main/resources/assets/forestry/textures/gui/errors/noSpecimen.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/noStamps.png b/src/main/resources/assets/forestry/textures/gui/errors/noStamps.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/noStamps.png rename to src/main/resources/assets/forestry/textures/gui/errors/noStamps.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notAlphaNumeric.png b/src/main/resources/assets/forestry/textures/gui/errors/notAlphaNumeric.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notAlphaNumeric.png rename to src/main/resources/assets/forestry/textures/gui/errors/notAlphaNumeric.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notDay.png b/src/main/resources/assets/forestry/textures/gui/errors/notDay.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notDay.png rename to src/main/resources/assets/forestry/textures/gui/errors/notDay.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notGloomy.png b/src/main/resources/assets/forestry/textures/gui/errors/notGloomy.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notGloomy.png rename to src/main/resources/assets/forestry/textures/gui/errors/notGloomy.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notLucid.png b/src/main/resources/assets/forestry/textures/gui/errors/notLucid.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notLucid.png rename to src/main/resources/assets/forestry/textures/gui/errors/notLucid.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notNight.png b/src/main/resources/assets/forestry/textures/gui/errors/notNight.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notNight.png rename to src/main/resources/assets/forestry/textures/gui/errors/notNight.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notRaining.png b/src/main/resources/assets/forestry/textures/gui/errors/notRaining.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notRaining.png rename to src/main/resources/assets/forestry/textures/gui/errors/notRaining.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/notUnique.png b/src/main/resources/assets/forestry/textures/gui/errors/notUnique.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/notUnique.png rename to src/main/resources/assets/forestry/textures/gui/errors/notUnique.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/ok.png b/src/main/resources/assets/forestry/textures/gui/errors/ok.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/ok.png rename to src/main/resources/assets/forestry/textures/gui/errors/ok.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/tooCold.png b/src/main/resources/assets/forestry/textures/gui/errors/tooCold.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/tooCold.png rename to src/main/resources/assets/forestry/textures/gui/errors/tooCold.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/tooHot.png b/src/main/resources/assets/forestry/textures/gui/errors/tooHot.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/tooHot.png rename to src/main/resources/assets/forestry/textures/gui/errors/tooHot.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/tooHumid.png b/src/main/resources/assets/forestry/textures/gui/errors/tooHumid.png similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/tooHumid.png rename to src/main/resources/assets/forestry/textures/gui/errors/tooHumid.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/unknown.png b/src/main/resources/assets/forestry/textures/gui/errors/unknown.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/unknown.png rename to src/main/resources/assets/forestry/textures/gui/errors/unknown.png diff --git a/src/main/resources/assets/forestry/textures/items/errors/wrongStacksize.png b/src/main/resources/assets/forestry/textures/gui/errors/wrongStacksize.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/errors/wrongStacksize.png rename to src/main/resources/assets/forestry/textures/gui/errors/wrongStacksize.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/desert.png b/src/main/resources/assets/forestry/textures/gui/habitats/desert.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/desert.png rename to src/main/resources/assets/forestry/textures/gui/habitats/desert.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/end.png b/src/main/resources/assets/forestry/textures/gui/habitats/end.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/end.png rename to src/main/resources/assets/forestry/textures/gui/habitats/end.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/forest.png b/src/main/resources/assets/forestry/textures/gui/habitats/forest.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/forest.png rename to src/main/resources/assets/forestry/textures/gui/habitats/forest.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/hills.png b/src/main/resources/assets/forestry/textures/gui/habitats/hills.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/hills.png rename to src/main/resources/assets/forestry/textures/gui/habitats/hills.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/jungle.png b/src/main/resources/assets/forestry/textures/gui/habitats/jungle.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/jungle.png rename to src/main/resources/assets/forestry/textures/gui/habitats/jungle.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/mushroom.png b/src/main/resources/assets/forestry/textures/gui/habitats/mushroom.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/mushroom.png rename to src/main/resources/assets/forestry/textures/gui/habitats/mushroom.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/nether.png b/src/main/resources/assets/forestry/textures/gui/habitats/nether.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/nether.png rename to src/main/resources/assets/forestry/textures/gui/habitats/nether.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/ocean.png b/src/main/resources/assets/forestry/textures/gui/habitats/ocean.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/ocean.png rename to src/main/resources/assets/forestry/textures/gui/habitats/ocean.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/plains.png b/src/main/resources/assets/forestry/textures/gui/habitats/plains.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/plains.png rename to src/main/resources/assets/forestry/textures/gui/habitats/plains.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/snow.png b/src/main/resources/assets/forestry/textures/gui/habitats/snow.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/snow.png rename to src/main/resources/assets/forestry/textures/gui/habitats/snow.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/swamp.png b/src/main/resources/assets/forestry/textures/gui/habitats/swamp.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/swamp.png rename to src/main/resources/assets/forestry/textures/gui/habitats/swamp.png diff --git a/src/main/resources/assets/forestry/textures/items/habitats/taiga.png b/src/main/resources/assets/forestry/textures/gui/habitats/taiga.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/habitats/taiga.png rename to src/main/resources/assets/forestry/textures/gui/habitats/taiga.png diff --git a/src/main/resources/assets/forestry/textures/items/mail/carrier.player.png b/src/main/resources/assets/forestry/textures/gui/mail/carrier.player.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/mail/carrier.player.png rename to src/main/resources/assets/forestry/textures/gui/mail/carrier.player.png diff --git a/src/main/resources/assets/forestry/textures/items/mail/carrier.trader.png b/src/main/resources/assets/forestry/textures/gui/mail/carrier.trader.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/mail/carrier.trader.png rename to src/main/resources/assets/forestry/textures/gui/mail/carrier.trader.png diff --git a/src/main/resources/assets/forestry/textures/items/misc/access.private.png b/src/main/resources/assets/forestry/textures/gui/misc/access.private.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/misc/access.private.png rename to src/main/resources/assets/forestry/textures/gui/misc/access.private.png diff --git a/src/main/resources/assets/forestry/textures/items/misc/access.shared.png b/src/main/resources/assets/forestry/textures/gui/misc/access.shared.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/misc/access.shared.png rename to src/main/resources/assets/forestry/textures/gui/misc/access.shared.png diff --git a/src/main/resources/assets/forestry/textures/items/misc/access.viewable.png b/src/main/resources/assets/forestry/textures/gui/misc/access.viewable.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/misc/access.viewable.png rename to src/main/resources/assets/forestry/textures/gui/misc/access.viewable.png diff --git a/src/main/resources/assets/forestry/textures/items/misc/energy.png b/src/main/resources/assets/forestry/textures/gui/misc/energy.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/misc/energy.png rename to src/main/resources/assets/forestry/textures/gui/misc/energy.png diff --git a/src/main/resources/assets/forestry/textures/items/misc/hint.png b/src/main/resources/assets/forestry/textures/gui/misc/hint.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/misc/hint.png rename to src/main/resources/assets/forestry/textures/gui/misc/hint.png diff --git a/src/main/resources/assets/forestry/textures/items/slots/blocked.png b/src/main/resources/assets/forestry/textures/gui/slots/blocked.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/slots/blocked.png rename to src/main/resources/assets/forestry/textures/gui/slots/blocked.png diff --git a/src/main/resources/assets/forestry/textures/items/slots/blocked_2.png b/src/main/resources/assets/forestry/textures/gui/slots/blocked_2.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/slots/blocked_2.png rename to src/main/resources/assets/forestry/textures/gui/slots/blocked_2.png diff --git a/src/main/resources/assets/forestry/textures/items/slots/container.png b/src/main/resources/assets/forestry/textures/gui/slots/container.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/slots/container.png rename to src/main/resources/assets/forestry/textures/gui/slots/container.png diff --git a/src/main/resources/assets/forestry/textures/items/slots/liquid.png b/src/main/resources/assets/forestry/textures/gui/slots/liquid.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/slots/liquid.png rename to src/main/resources/assets/forestry/textures/gui/slots/liquid.png diff --git a/src/main/resources/assets/forestry/textures/items/slots/locked.png b/src/main/resources/assets/forestry/textures/gui/slots/locked.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/slots/locked.png rename to src/main/resources/assets/forestry/textures/gui/slots/locked.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/hasMail.png b/src/main/resources/assets/forestry/textures/gui/triggers/hasMail.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/hasMail.png rename to src/main/resources/assets/forestry/textures/gui/triggers/hasMail.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/hasWork.png b/src/main/resources/assets/forestry/textures/gui/triggers/hasWork.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/hasWork.png rename to src/main/resources/assets/forestry/textures/gui/triggers/hasWork.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowFertilizer.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowFertilizer.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowFertilizer.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowFertilizer.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowFuel.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowFuel.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowFuel.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowFuel.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowGermlings.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowGermlings.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowGermlings.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowGermlings.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowInput.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowInput.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowInput.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowInput.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowLiquid.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowLiquid.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowLiquid.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowLiquid.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowPaper.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowPaper.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowPaper.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowPaper.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowResources.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowResources.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowResources.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowResources.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowSoil.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowSoil.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowSoil.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowSoil.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/lowStamps.png b/src/main/resources/assets/forestry/textures/gui/triggers/lowStamps.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/lowStamps.png rename to src/main/resources/assets/forestry/textures/gui/triggers/lowStamps.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/mailBuffer.png b/src/main/resources/assets/forestry/textures/gui/triggers/mailBuffer.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/mailBuffer.png rename to src/main/resources/assets/forestry/textures/gui/triggers/mailBuffer.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/missingDrone.png b/src/main/resources/assets/forestry/textures/gui/triggers/missingDrone.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/missingDrone.png rename to src/main/resources/assets/forestry/textures/gui/triggers/missingDrone.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/missingQueen.png b/src/main/resources/assets/forestry/textures/gui/triggers/missingQueen.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/missingQueen.png rename to src/main/resources/assets/forestry/textures/gui/triggers/missingQueen.png diff --git a/src/main/resources/assets/forestry/textures/items/triggers/noFrames.png b/src/main/resources/assets/forestry/textures/gui/triggers/noFrames.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/items/triggers/noFrames.png rename to src/main/resources/assets/forestry/textures/gui/triggers/noFrames.png