diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index 4350a5aa..2fe4960c 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -17,6 +17,6 @@ public final class Binnie { public static final ManagerGenetics GENETICS = new ManagerGenetics(); public static final ManagerConfig CONFIGURATION = new ManagerConfig(); public static final ManagerLiquid LIQUID = new ManagerLiquid(); - public static final ManagerMachine MCHINE = new ManagerMachine(); + public static final ManagerMachine MACHINE = new ManagerMachine(); public static final ManagerResource RESOURCE = new ManagerResource(); } diff --git a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java index 2d540752..a9b7dd5c 100644 --- a/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/botany/genetics/FlowerBreedingSystem.java @@ -24,8 +24,8 @@ import java.util.TreeSet; public class FlowerBreedingSystem extends BreedingSystem { public FlowerBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee"); } @Override diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index fc940fee..d7424735 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -168,7 +168,7 @@ public final class BinnieCore extends AbstractMod { // if (event.map.getTextureType() == 0) { // Binnie.Liquid.reloadIcons(event.map); // } - Binnie.RESOURCE.registerIcons(); + Binnie.RESOURCE.registerSprites(); } @SubscribeEvent diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 9f1d9f15..36824d9d 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -22,8 +22,8 @@ import java.util.TreeSet; class BeeBreedingSystem extends BreedingSystem { public BeeBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee"); } @Override diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 56cfd3bc..5da0f639 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -2,7 +2,7 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.core.resource.BinnieIcon; +import binnie.core.resource.BinnieSprite; import binnie.extrabees.genetics.ExtraBeeMutation; import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryEvent; @@ -35,8 +35,8 @@ import java.util.Set; import java.util.TreeSet; public abstract class BreedingSystem implements IItemStackRepresentitive { - protected BinnieIcon iconUndiscovered; - protected BinnieIcon iconDiscovered; + protected BinnieSprite iconUndiscovered; + protected BinnieSprite iconDiscovered; private List allBranches; List allActiveSpecies; private List allSpecies; diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 4e4503ba..12d1cde8 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -20,8 +20,8 @@ import java.util.TreeSet; class MothBreedingSystem extends BreedingSystem { public MothBreedingSystem() { - this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth"); - this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredMoth"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredMoth"); } @Override diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 1e347b90..42044abe 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -53,8 +53,8 @@ public class TreeBreedingSystem extends BreedingSystem { this.discoveredFruits = new UniqueItemStackSet(); this.discoveredWoods = new UniqueItemStackSet(); this.discoveredPlanks = new UniqueItemStackSet(); - this.iconUndiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/undiscoveredTree"); - this.iconDiscovered = Binnie.RESOURCE.getItemIcon(ExtraTrees.instance, "icon/discoveredTree"); + this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredTree"); + this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredTree"); } @Override diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index 6621c426..b180ef31 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -36,14 +36,14 @@ public class MachineComponent implements INbtReadable, INbtWritable { } public Class[] getComponentInterfaces() { - return Binnie.MCHINE.getComponentInterfaces(this.getClass()); + return Binnie.MACHINE.getComponentInterfaces(this.getClass()); } public void onInventoryUpdate() { } public final MachinePayload getPayload() { - return new MachinePayload(Binnie.MCHINE.getNetworkID(this.getClass())); + return new MachinePayload(Binnie.MACHINE.getNetworkID(this.getClass())); } public void recieveData(final MachinePayload payload) { diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index f0d077fb..3f7bb22a 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -43,7 +43,7 @@ public class MachineGroup { } } } - Binnie.MCHINE.registerMachineGroup(this); + Binnie.MACHINE.registerMachineGroup(this); this.block = new BlockMachine(this, blockName); mod.getProxy().registerBlock(this.block); Item i = mod.getProxy().registerItem(new ItemMachine(this.block)); diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 1178c1fe..31b4d332 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -3,7 +3,7 @@ package binnie.core.machines; import binnie.core.BinnieCore; import binnie.core.ManagerBase; import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.ValidatorIcon; +import binnie.core.machines.inventory.ValidatorSprite; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; @@ -70,11 +70,10 @@ public class ManagerMachine extends ManagerBase { @Override public void init() { - //TODO renderupdate - SlotValidator.IconBee = new ValidatorIcon(BinnieCore.instance, "validator/bee.0", "validator/bee.1"); - SlotValidator.IconFrame = new ValidatorIcon(BinnieCore.instance, "validator/frame.0", "validator/frame.1"); - SlotValidator.IconCircuit = new ValidatorIcon(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1"); - SlotValidator.IconBlock = new ValidatorIcon(BinnieCore.instance, "validator/block.0", "validator/block.1"); + SlotValidator.spriteBee = new ValidatorSprite(BinnieCore.instance, "validator/bee.0", "validator/bee.1"); + SlotValidator.spriteFrame = new ValidatorSprite(BinnieCore.instance, "validator/frame.0", "validator/frame.1"); + SlotValidator.spriteCircuit = new ValidatorSprite(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1"); + SlotValidator.spriteBlock = new ValidatorSprite(BinnieCore.instance, "validator/block.0", "validator/block.1"); } @Override diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/src/main/java/binnie/core/machines/TileEntityMachine.java index 79a24ff6..ec0c598e 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -36,7 +36,7 @@ public class TileEntityMachine extends TileEntityMachineBase implements INetwork super.readFromNBT(nbtTagCompound); final String name = nbtTagCompound.getString("name"); final String group = nbtTagCompound.getString("group"); - final MachinePackage pack = Binnie.MCHINE.getPackage(group, name); + final MachinePackage pack = Binnie.MACHINE.getPackage(group, name); if (pack == null) { this.invalidate(); return; diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index d23c995b..4bd78f25 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -1,6 +1,5 @@ package binnie.core.machines.inventory; -import binnie.core.BinnieCore; import forestry.api.genetics.AlleleManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; @@ -8,27 +7,27 @@ import net.minecraft.item.ItemStack; import javax.annotation.Nullable; public abstract class SlotValidator extends Validator { - public static ValidatorIcon IconBee; - public static ValidatorIcon IconFrame; - public static ValidatorIcon IconCircuit; - public static ValidatorIcon IconBlock; + public static ValidatorSprite spriteBee; + public static ValidatorSprite spriteFrame; + public static ValidatorSprite spriteCircuit; + public static ValidatorSprite spriteBlock; @Nullable - private ValidatorIcon icon; + private ValidatorSprite sprite; - public SlotValidator(@Nullable final ValidatorIcon icon) { - this.icon = icon; + public SlotValidator(@Nullable final ValidatorSprite icon) { + this.sprite = icon; } @Nullable public TextureAtlasSprite getIcon(final boolean input) { - return (this.icon == null) ? null : BinnieCore.proxy.getTextureAtlasSprite(this.icon.getIcon(input).getResourceLocation()); + return (this.sprite == null) ? null : this.sprite.getSprite(input).getSprite(); } public static class Item extends SlotValidator { private ItemStack target; - public Item(final ItemStack target, final ValidatorIcon icon) { + public Item(final ItemStack target, final ValidatorSprite icon) { super(icon); this.target = target; } diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java deleted file mode 100644 index b0965993..00000000 --- a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.core.machines.inventory; - -import binnie.Binnie; -import binnie.core.AbstractMod; -import binnie.core.resource.BinnieIcon; - -import java.util.ArrayList; -import java.util.List; - -public class ValidatorIcon { - private List iconsInput; - private List iconsOutput; - - public ValidatorIcon(final AbstractMod mod, final String pathInput, final String pathOutput) { - this.iconsInput = new ArrayList<>(); - this.iconsOutput = new ArrayList<>(); - this.iconsInput.add(Binnie.RESOURCE.getItemIcon(mod, pathInput)); - this.iconsOutput.add(Binnie.RESOURCE.getItemIcon(mod, pathOutput)); - } - - public BinnieIcon getIcon(final boolean input) { - return input ? this.iconsInput.get(0) : this.iconsOutput.get(0); - } -} diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java new file mode 100644 index 00000000..fd60a130 --- /dev/null +++ b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java @@ -0,0 +1,24 @@ +package binnie.core.machines.inventory; + +import binnie.Binnie; +import binnie.core.AbstractMod; +import binnie.core.resource.BinnieSprite; + +import java.util.ArrayList; +import java.util.List; + +public class ValidatorSprite { + private List spritesInput; + private List spritesOutput; + + public ValidatorSprite(final AbstractMod mod, final String pathInput, final String pathOutput) { + this.spritesInput = new ArrayList<>(); + this.spritesOutput = new ArrayList<>(); + this.spritesInput.add(Binnie.RESOURCE.getItemSprite(mod, pathInput)); + this.spritesOutput.add(Binnie.RESOURCE.getItemSprite(mod, pathOutput)); + } + + public BinnieSprite getSprite(final boolean input) { + return input ? this.spritesInput.get(0) : this.spritesOutput.get(0); + } +} diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 67c066ff..6a27070f 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -137,7 +137,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { this.sendToAll(packet); } - public void registerIcon(ResourceLocation location) { + public void registerSprite(ResourceLocation location) { } diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 057bc412..d9347f43 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -63,7 +63,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy } @Override - public void registerIcon(ResourceLocation location) { + public void registerSprite(ResourceLocation location) { Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(location); } diff --git a/src/main/java/binnie/core/resource/BinnieIcon.java b/src/main/java/binnie/core/resource/BinnieIcon.java deleted file mode 100644 index b73158e3..00000000 --- a/src/main/java/binnie/core/resource/BinnieIcon.java +++ /dev/null @@ -1,37 +0,0 @@ -package binnie.core.resource; - - -import binnie.Binnie; -import binnie.core.AbstractMod; - -public class BinnieIcon extends BinnieResource { -// private int textureSheet; -// private IIcon icon; - - public BinnieIcon(final AbstractMod mod, final ResourceType type, final String path) { - super(mod, type, path); -// this.textureSheet = 0; -// this.icon = null; - //this.textureSheet = ((type != ResourceType.Block) ? 1 : 0); - Binnie.RESOURCE.registerIcon(this); - } - -// public IIcon getIcon() { -// return this.icon; -// } -// -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(final IIconRegister register) { -// this.registerIcon(register); -// return this.icon; -// } -// -// @SideOnly(Side.CLIENT) -// public void registerIcon(final IIconRegister register) { -// this.icon = BinnieCore.proxy.getIcon(register, this.mod, this.path); -// } - -// public int getTextureSheet() { -// return this.textureSheet; -// } -} diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/src/main/java/binnie/core/resource/BinnieSprite.java new file mode 100644 index 00000000..6a70e774 --- /dev/null +++ b/src/main/java/binnie/core/resource/BinnieSprite.java @@ -0,0 +1,29 @@ +package binnie.core.resource; + + +import binnie.Binnie; +import binnie.core.AbstractMod; +import forestry.core.render.TextureManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class BinnieSprite extends BinnieResource { + private TextureAtlasSprite sprite; + + public BinnieSprite(final AbstractMod mod, final ResourceType type, final String path) { + super(mod, type, path); + this.sprite = null; + Binnie.RESOURCE.registerSprite(this); + } + + @SideOnly(Side.CLIENT) + public TextureAtlasSprite getSprite() { + return this.sprite; + } + + @SideOnly(Side.CLIENT) + public void registerSprites() { + sprite = TextureManager.registerSprite(getResourceLocation()); + } +} diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index ddd9bc21..a787c7c0 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -2,15 +2,17 @@ package binnie.core.resource; import binnie.core.AbstractMod; import binnie.core.BinnieCore; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; public class ManagerResource { - private List icons; + private List sprites; public ManagerResource() { - this.icons = new ArrayList<>(); + this.sprites = new ArrayList<>(); } public BinnieResource getPNG(final AbstractMod mod, final ResourceType type, final String path) { @@ -21,32 +23,25 @@ public class ManagerResource { return new BinnieResource(mod, type, path); } - public void registerIcon(final BinnieIcon binnieIcon) { - this.icons.add(binnieIcon); + public void registerSprite(final BinnieSprite binnieIcon) { + this.sprites.add(binnieIcon); } - public BinnieIcon getItemIcon(final AbstractMod mod, final String iconFile) { - return new BinnieIcon(mod, ResourceType.Item, iconFile); + public BinnieSprite getItemSprite(final AbstractMod mod, final String iconFile) { + return new BinnieSprite(mod, ResourceType.Item, iconFile); } - public BinnieIcon getBlockIcon(final AbstractMod mod, final String iconFile) { - return new BinnieIcon(mod, ResourceType.Block, iconFile); + public BinnieSprite getBlockSprite(final AbstractMod mod, final String iconFile) { + return new BinnieSprite(mod, ResourceType.Block, iconFile); } - public void registerIcons() { - for (final BinnieIcon icon : this.icons) { - BinnieCore.proxy.registerIcon(icon.getResourceLocation()); + @SideOnly(Side.CLIENT) + public void registerSprites() { + for (BinnieSprite sprite : this.sprites) { + sprite.registerSprites(); } BinnieCore.proxy.reloadSprites(); } -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register, final int type) { -// for (final BinnieIcon icon : this.icons) { -// if (icon.getTextureSheet() == type) { -// icon.registerIcon(register); -// } -// } -// } } diff --git a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/craftgui/minecraft/GUIIcon.java index 7de3f4ad..65272642 100644 --- a/src/main/java/binnie/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/GUIIcon.java @@ -2,7 +2,7 @@ package binnie.craftgui.minecraft; import binnie.Binnie; import binnie.core.BinnieCore; -import binnie.core.resource.BinnieIcon; +import binnie.core.resource.BinnieSprite; public enum GUIIcon { ArrowUp("arrow-up"), @@ -19,17 +19,17 @@ public enum GUIIcon { ArrowLeftUp("arrow-leftup"); String path; - BinnieIcon icon; + BinnieSprite icon; GUIIcon(final String path) { this.path = path; } public void register() { - this.icon = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/" + this.path); + this.icon = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/" + this.path); } - public BinnieIcon getIcon() { + public BinnieSprite getIcon() { return this.icon; } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java index ae7f264b..d4176bc8 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java @@ -9,15 +9,15 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; public class ControlIconDisplay extends Control { - private TextureAtlasSprite icon; + private TextureAtlasSprite sprite; public ControlIconDisplay(final IWidget parent, final int x, final int y, final ResourceLocation icon) { super(parent, x, y, 16, 16); - this.icon = BinnieCore.proxy.getTextureAtlasSprite(icon); + this.sprite = BinnieCore.proxy.getTextureAtlasSprite(icon); } @Override public void onRenderForeground(int guiWidth, int guiHeight) { - RenderUtil.drawSprite(IPoint.ZERO, this.icon); + RenderUtil.drawSprite(IPoint.ZERO, this.sprite); } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index cff340ff..45a2d910 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -15,6 +15,7 @@ import binnie.craftgui.minecraft.InventoryType; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.WindowInventory; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.renderer.GlStateManager; @@ -69,7 +70,7 @@ public class ControlSlot extends ControlSlotBase { SlotValidator validator = islot.getValidator(); if (validator != null) { final TextureAtlasSprite icon = validator.getIcon(!islot.getInputSides().isEmpty()); - if (icon != null) { + if (icon != null && icon != Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite()) { GlStateManager.enableBlend(); RenderUtil.drawSprite(new IPoint(1, 1), icon); GlStateManager.disableBlend(); diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index 6037846f..f94125fb 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -1,45 +1,30 @@ package binnie.extrabees.apiary; -import binnie.Constants; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.circuits.BinnieCircuitLayout; import binnie.core.circuits.BinnieCircuitSocketType; import binnie.core.machines.MachineGroup; +import binnie.core.machines.inventory.ValidatorSprite; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyMachine; import binnie.extrabees.apiary.machine.AlvearyMutator; import binnie.extrabees.apiary.machine.AlvearyStimulator; import forestry.api.core.Tabs; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleApiary implements IInitializable { public static Block blockComponent; + public static ValidatorSprite spriteMutator; BinnieCircuitLayout stimulatorLayout; - - @SubscribeEvent - @SideOnly(Side.CLIENT) - @Mod.EventHandler - public void texture(TextureStitchEvent e) { - Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "items/validator/mutator.0")); - Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(new ResourceLocation(Constants.EXTRA_BEES_MOD_ID, "items/validator/mutator.1")); - } - @Override public void preInit() { final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values()); @@ -84,5 +69,6 @@ public class ModuleApiary implements IInitializable { @Override public void init() { this.stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator", BinnieCircuitSocketType.STIMULATOR); + ModuleApiary.spriteMutator = new ValidatorSprite(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1"); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java index cd9a06f2..e4c1c21c 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyFrame.java @@ -37,7 +37,7 @@ public class AlvearyFrame { public static class SlotValidatorFrame extends SlotValidator { public SlotValidatorFrame() { - super(SlotValidator.IconFrame); + super(SlotValidator.spriteFrame); } @Override diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java index 42cb2544..5b6d0b63 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyHatchery.java @@ -43,7 +43,7 @@ public class AlvearyHatchery { public static class SlotValidatorLarvae extends SlotValidator { public SlotValidatorLarvae() { - super(SlotValidator.IconBee); + super(SlotValidator.spriteBee); } @Override diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java index f76d8631..088fd09a 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMutator.java @@ -3,11 +3,10 @@ package binnie.extrabees.apiary.machine; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.ValidatorIcon; import binnie.craftgui.minecraft.IMachineInformation; -import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.ComponentExtraBeeGUI; +import binnie.extrabees.apiary.ModuleApiary; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.apiculture.IBee; @@ -69,7 +68,7 @@ public class AlvearyMutator { public static class SlotValidatorMutator extends SlotValidator { public SlotValidatorMutator() { - super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1")); + super(ModuleApiary.spriteMutator); } @Override diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java index 566789fb..a4bf0d1b 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyStimulator.java @@ -47,7 +47,7 @@ public class AlvearyStimulator { public static class SlotValidatorCircuit extends SlotValidator { public SlotValidatorCircuit() { - super(SlotValidator.IconCircuit); + super(SlotValidator.spriteCircuit); } @Override diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 124fa267..318585ed 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -4,7 +4,7 @@ import binnie.Binnie; import binnie.core.IInitializable; import binnie.core.liquid.IFluidType; import binnie.core.liquid.ItemFluidContainer; -import binnie.core.resource.BinnieIcon; +import binnie.core.resource.BinnieSprite; import binnie.extratrees.ExtraTrees; import binnie.extratrees.alcohol.drink.DrinkLiquid; import binnie.extratrees.alcohol.drink.DrinkManager; @@ -32,11 +32,11 @@ public class ModuleAlcohol implements IInitializable { public ItemDrink drink; public Block blockDrink; public int drinkRendererID; - public BinnieIcon liquid; + public BinnieSprite liquid; @Override public void preInit() { - this.liquid = Binnie.RESOURCE.getBlockIcon(ExtraTrees.instance, "liquids/liquid"); + this.liquid = Binnie.RESOURCE.getBlockSprite(ExtraTrees.instance, "liquids/liquid"); //ModuleAlcohol.drinkRendererID = BinnieCore.proxy.getUniqueRenderID(); this.drink = new ItemDrink(); ExtraTrees.proxy.registerItem(drink); diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index 4441e7b3..ec6d1cab 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -2,15 +2,15 @@ package binnie.extratrees.core; import binnie.core.gui.IBinnieGUID; import binnie.craftgui.minecraft.Window; -import binnie.extratrees.item.craftgui.WindowArboristDatabase; -import binnie.extratrees.item.craftgui.WindowBrewery; -import binnie.extratrees.item.craftgui.WindowDistillery; -import binnie.extratrees.item.craftgui.WindowLepidopteristDatabase; -import binnie.extratrees.item.craftgui.WindowLumbermill; -import binnie.extratrees.item.craftgui.WindowPress; -import binnie.extratrees.item.craftgui.WindowSetSquare; -import binnie.extratrees.item.craftgui.WindowWoodworker; import binnie.extratrees.kitchen.craftgui.WindowBottleRack; +import binnie.extratrees.machines.craftgui.WindowArboristDatabase; +import binnie.extratrees.machines.craftgui.WindowBrewery; +import binnie.extratrees.machines.craftgui.WindowDistillery; +import binnie.extratrees.machines.craftgui.WindowLepidopteristDatabase; +import binnie.extratrees.machines.craftgui.WindowLumbermill; +import binnie.extratrees.machines.craftgui.WindowPress; +import binnie.extratrees.machines.craftgui.WindowSetSquare; +import binnie.extratrees.machines.craftgui.WindowWoodworker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java index feb78335..59cd917e 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java @@ -2,7 +2,7 @@ package binnie.extratrees.integration.jei.distillery.brewery; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.IPoint; -import binnie.extratrees.item.craftgui.ControlDistilleryProgress; +import binnie.extratrees.machines.craftgui.ControlDistilleryProgress; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 8e33b8c1..4e18f51a 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -4,6 +4,7 @@ import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; +import binnie.core.machines.inventory.ValidatorSprite; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; import forestry.api.core.Tabs; @@ -15,6 +16,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { + public static ValidatorSprite spritePolish; public Block blockMachine; @@ -30,6 +32,7 @@ public class ModuleMachine implements IInitializable { @Override public void init() { + ModuleMachine.spritePolish = new ValidatorSprite(ExtraTrees.instance, "validator/polish.0", "validator/polish.1"); } @Override diff --git a/src/main/java/binnie/extratrees/machines/Validators.java b/src/main/java/binnie/extratrees/machines/Validators.java index db3ca5af..f78ce677 100644 --- a/src/main/java/binnie/extratrees/machines/Validators.java +++ b/src/main/java/binnie/extratrees/machines/Validators.java @@ -1,8 +1,6 @@ package binnie.extratrees.machines; import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.ValidatorIcon; -import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.IDesignMaterial; import net.minecraft.item.ItemStack; @@ -11,7 +9,7 @@ public class Validators { DesignerType type; public SlotValidatorBeeswax(final DesignerType type) { - super(new ValidatorIcon(ExtraTrees.instance, "validator/polish.0", "validator/polish.1")); + super(ModuleMachine.spritePolish); this.type = type; } @@ -30,7 +28,7 @@ public class Validators { DesignerType type; public SlotValidatorPlanks(final DesignerType type) { - super(SlotValidator.IconBlock); + super(SlotValidator.spriteBlock); this.type = type; } diff --git a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java index 4e3d143f..3587214c 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java +++ b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryGrain.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public class SlotValidatorBreweryGrain extends SlotValidator { public SlotValidatorBreweryGrain() { - super(SlotValidator.IconBlock); + super(SlotValidator.spriteBlock); } @Override diff --git a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java index 2393fd12..2963fa46 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java +++ b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryIngredient.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public class SlotValidatorBreweryIngredient extends SlotValidator { public SlotValidatorBreweryIngredient() { - super(SlotValidator.IconBlock); + super(SlotValidator.spriteBlock); } @Override diff --git a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java index 4570870c..d4f0ee87 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java +++ b/src/main/java/binnie/extratrees/machines/brewery/SlotValidatorBreweryYeast.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public class SlotValidatorBreweryYeast extends SlotValidator { public SlotValidatorBreweryYeast() { - super(SlotValidator.IconBlock); + super(SlotValidator.spriteBlock); } @Override diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java similarity index 93% rename from src/main/java/binnie/extratrees/item/craftgui/ControlBlockIconDisplay.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java index cf8f0dcd..efd7f180 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/ControlBreweryProgress.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java index f3d105f2..acdf2b37 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.machines.Machine; import binnie.core.util.ItemStackSet; diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/ControlDistilleryProgress.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index 2b918ef1..f11735e2 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.machines.Machine; import binnie.craftgui.core.CraftGUI; diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/ControlFruitPressProgress.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index 8c29a2ec..12c040cd 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/ControlLumbermillProgress.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java index a894eca0..fd67f336 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java similarity index 96% rename from src/main/java/binnie/extratrees/item/craftgui/ControlRecipeSlot.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java index f464cfbc..5ccdf79d 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; diff --git a/src/main/java/binnie/extratrees/item/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java similarity index 99% rename from src/main/java/binnie/extratrees/item/craftgui/ControlTileSelect.java rename to src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 7d393b27..e6315496 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/extratrees/item/craftgui/DialogBreweryRecipe.java b/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java similarity index 87% rename from src/main/java/binnie/extratrees/item/craftgui/DialogBreweryRecipe.java rename to src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java index 5ac32b7c..d173557f 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/DialogBreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/DialogBreweryRecipe.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.craftgui.core.IWidget; import binnie.craftgui.minecraft.Dialog; diff --git a/src/main/java/binnie/extratrees/item/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java similarity index 97% rename from src/main/java/binnie/extratrees/item/craftgui/PageFruit.java rename to src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java index 8bc410c0..dd31e57b 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/extratrees/item/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/PagePlanksOverview.java rename to src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index 7b479169..045781a9 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.BinnieCore; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/extratrees/item/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java similarity index 96% rename from src/main/java/binnie/extratrees/item/craftgui/PagePlanksTrees.java rename to src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java index 24b19621..2630edcb 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesImage.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java similarity index 95% rename from src/main/java/binnie/extratrees/item/craftgui/PageSpeciesImage.java rename to src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java index ec0f9058..1a6dd7df 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesImage.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; diff --git a/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java similarity index 99% rename from src/main/java/binnie/extratrees/item/craftgui/PageSpeciesTreeGenome.java rename to src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index b91a694f..5133ba47 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/extratrees/item/craftgui/PageWood.java b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java similarity index 96% rename from src/main/java/binnie/extratrees/item/craftgui/PageWood.java rename to src/main/java/binnie/extratrees/machines/craftgui/PageWood.java index b1dd3aad..71ac5f54 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java similarity index 99% rename from src/main/java/binnie/extratrees/item/craftgui/WindowArboristDatabase.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 06a0b366..940f19d0 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowBrewery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java similarity index 97% rename from src/main/java/binnie/extratrees/item/craftgui/WindowBrewery.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java index f5b16afd..e0d9fe01 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowBrewery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowBrewery.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowDistillery.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java similarity index 97% rename from src/main/java/binnie/extratrees/item/craftgui/WindowDistillery.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java index 0c20c80f..4c46d105 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowDistillery.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/WindowLepidopteristDatabase.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java index f0e35f20..7ddabb55 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLepidopteristDatabase.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.Binnie; import binnie.core.AbstractMod; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java similarity index 97% rename from src/main/java/binnie/extratrees/item/craftgui/WindowLumbermill.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java index 5909ae32..65ebb536 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowLumbermill.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/WindowPress.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index b2e24617..31c8e24b 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.machines.Machine; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java similarity index 95% rename from src/main/java/binnie/extratrees/item/craftgui/WindowSetSquare.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java index 769e0fb6..2f2c9cac 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowSetSquare.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.craftgui.minecraft.Window; diff --git a/src/main/java/binnie/extratrees/item/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java similarity index 98% rename from src/main/java/binnie/extratrees/item/craftgui/WindowWoodworker.java rename to src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 57745517..3e9ab0a6 100644 --- a/src/main/java/binnie/extratrees/item/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -1,4 +1,4 @@ -package binnie.extratrees.item.craftgui; +package binnie.extratrees.machines.craftgui; import binnie.core.AbstractMod; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java b/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java index 11f3f9dc..8a0bf399 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public class SlotValidatorSqueezable extends SlotValidator { public SlotValidatorSqueezable() { - super(SlotValidator.IconBlock); + super(SlotValidator.spriteBlock); } @Override diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java b/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java index b216494e..9b7ecd37 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/SlotValidatorLog.java @@ -8,7 +8,7 @@ public class SlotValidatorLog extends SlotValidator { private static final int logWoodId = OreDictionary.getOreID("logWood"); public SlotValidatorLog() { - super(SlotValidator.IconBlock); + super(SlotValidator.spriteBlock); } @Override diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index 9409c441..c1d1b686 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -1,7 +1,7 @@ package binnie.genetics.core; import binnie.Binnie; -import binnie.core.resource.BinnieIcon; +import binnie.core.resource.BinnieSprite; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; @@ -26,7 +26,7 @@ public enum GeneticsTexture implements IBinnieTexture { String texture; ResourceType type; - public static BinnieIcon dnaIcon = Binnie.RESOURCE.getItemIcon(Genetics.instance, "dna"); + public static BinnieSprite dnaIcon = Binnie.RESOURCE.getItemSprite(Genetics.instance, "dna"); GeneticsTexture(final ResourceType base, final String texture) { this.texture = texture; diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index a8c33396..2643c808 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -102,7 +102,7 @@ public class WindowAnalyst extends Window { return Analyser.isAnalysed(itemStack) || (Analyser.isAnalysable(itemStack) && WindowAnalyst.this.getWindowInventory().getStackInSlot(1) != null); } }); - this.getWindowInventory().setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.IconDye)); + this.getWindowInventory().setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.spriteDye)); } } diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 357ca558..c8488b3e 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -7,7 +7,7 @@ import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; -import binnie.core.resource.BinnieIcon; +import binnie.core.resource.BinnieSprite; import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; import binnie.genetics.CreativeTabGenetics; @@ -22,21 +22,21 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItem implements IInitializable { - public static BinnieIcon iconNight; - public static BinnieIcon iconDaytime; - public static BinnieIcon iconAllDay; - public static BinnieIcon iconRain; - public static BinnieIcon iconNoRain; - public static BinnieIcon iconSky; - public static BinnieIcon iconNoSky; - public static BinnieIcon iconFire; - public static BinnieIcon iconNoFire; - public static BinnieIcon iconAdd; - public static BinnieIcon iconArrow; - public static BinnieIcon iconAdd0; - public static BinnieIcon iconArrow0; - public static BinnieIcon iconAdd1; - public static BinnieIcon iconArrow1; + public static BinnieSprite iconNight; + public static BinnieSprite iconDaytime; + public static BinnieSprite iconAllDay; + public static BinnieSprite iconRain; + public static BinnieSprite iconNoRain; + public static BinnieSprite iconSky; + public static BinnieSprite iconNoSky; + public static BinnieSprite iconFire; + public static BinnieSprite iconNoFire; + public static BinnieSprite iconAdd; + public static BinnieSprite iconArrow; + public static BinnieSprite iconAdd0; + public static BinnieSprite iconArrow0; + public static BinnieSprite iconAdd1; + public static BinnieSprite iconArrow1; @Override public void preInit() { @@ -63,21 +63,21 @@ public class ModuleItem implements IInitializable { @Override public void init() { - ModuleItem.iconNight = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.night"); - ModuleItem.iconDaytime = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.day"); - ModuleItem.iconAllDay = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.allday"); - ModuleItem.iconRain = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.rain"); - ModuleItem.iconNoRain = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.norain"); - ModuleItem.iconSky = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.sky"); - ModuleItem.iconNoSky = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.nosky"); - ModuleItem.iconFire = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.fire"); - ModuleItem.iconNoFire = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.nofire"); - ModuleItem.iconAdd = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.add"); - ModuleItem.iconArrow = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.arrow"); - ModuleItem.iconAdd0 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.add.0"); - ModuleItem.iconArrow0 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.arrow.0"); - ModuleItem.iconAdd1 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.add.1"); - ModuleItem.iconArrow1 = Binnie.RESOURCE.getItemIcon(BinnieCore.instance, "gui/analyst.arrow.1"); + ModuleItem.iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.night"); + ModuleItem.iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.day"); + ModuleItem.iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.allday"); + ModuleItem.iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.rain"); + ModuleItem.iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.norain"); + ModuleItem.iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.sky"); + ModuleItem.iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.nosky"); + ModuleItem.iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.fire"); + ModuleItem.iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.nofire"); + ModuleItem.iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.add"); + ModuleItem.iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.arrow"); + ModuleItem.iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.add.0"); + ModuleItem.iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.arrow.0"); + ModuleItem.iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.add.1"); + ModuleItem.iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.instance, "gui/analyst.arrow.1"); } @Override diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index fe560d7d..543ad306 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -3,7 +3,7 @@ package binnie.genetics.machine; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; -import binnie.core.machines.inventory.ValidatorIcon; +import binnie.core.machines.inventory.ValidatorSprite; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; @@ -17,12 +17,12 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { - public static ValidatorIcon IconSequencer; - public static ValidatorIcon iconSerum; - public static ValidatorIcon IconEnzyme; - public static ValidatorIcon IconDye; - public static ValidatorIcon IconBacteria; - public static ValidatorIcon IconNugget; + public static ValidatorSprite spriteSequencer; + public static ValidatorSprite spriteSerum; + public static ValidatorSprite spriteEnzyme; + public static ValidatorSprite spriteDye; + public static ValidatorSprite spriteBacteria; + public static ValidatorSprite spriteNugget; @Override public void preInit() { @@ -33,12 +33,12 @@ public class ModuleMachine implements IInitializable { @Override public void init() { - ModuleMachine.IconSequencer = new ValidatorIcon(Genetics.instance, "validator/sequencer.0", "validator/sequencer.1"); - ModuleMachine.iconSerum = new ValidatorIcon(Genetics.instance, "validator/serum.0", "validator/serum.1"); - ModuleMachine.IconEnzyme = new ValidatorIcon(Genetics.instance, "validator/enzyme.0", "validator/enzyme.1"); - ModuleMachine.IconDye = new ValidatorIcon(Genetics.instance, "validator/dye.0", "validator/dye.1"); - ModuleMachine.IconNugget = new ValidatorIcon(Genetics.instance, "validator/nugget.0", "validator/nugget.1"); - ModuleMachine.IconBacteria = new ValidatorIcon(Genetics.instance, "validator/bacteria.0", "validator/bacteria.1"); + ModuleMachine.spriteSequencer = new ValidatorSprite(Genetics.instance, "validator/sequencer.0", "validator/sequencer.1"); + ModuleMachine.spriteSerum = new ValidatorSprite(Genetics.instance, "validator/serum.0", "validator/serum.1"); + ModuleMachine.spriteEnzyme = new ValidatorSprite(Genetics.instance, "validator/enzyme.0", "validator/enzyme.1"); + ModuleMachine.spriteDye = new ValidatorSprite(Genetics.instance, "validator/dye.0", "validator/dye.1"); + ModuleMachine.spriteNugget = new ValidatorSprite(Genetics.instance, "validator/nugget.0", "validator/nugget.1"); + ModuleMachine.spriteBacteria = new ValidatorSprite(Genetics.instance, "validator/bacteria.0", "validator/bacteria.1"); Incubator.addRecipes(); } diff --git a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java index 4cba99f6..8f597cb9 100644 --- a/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/PackageAnalyser.java @@ -36,7 +36,7 @@ public class PackageAnalyser extends GeneticMachine.PackageGeneticBase implement slotTarget.forbidInteraction(); InventorySlot slotDye = inventory.addSlot(Analyser.SLOT_DYE, "dye"); slotDye.forbidExtraction(); - slotDye.setValidator(new SlotValidator(ModuleMachine.IconDye) { + slotDye.setValidator(new SlotValidator(ModuleMachine.spriteDye) { @Override public boolean isValid(final ItemStack itemStack) { return itemStack.isItemEqual(GeneticsItems.DNADye.get(1)); diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index bb5f0b21..012becf9 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -1,7 +1,6 @@ package binnie.genetics.machine.craftgui; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.Attribute; @@ -78,6 +77,6 @@ public class ControlGene extends Control implements IControlValue, IToolt RenderUtil.drawSolidRect(this.getArea().inset(1), -12303292); } RenderUtil.setColour(-1); - RenderUtil.drawSprite(IPoint.ZERO, BinnieCore.proxy.getTextureAtlasSprite(GeneticsTexture.dnaIcon.getResourceLocation())); + RenderUtil.drawSprite(IPoint.ZERO, GeneticsTexture.dnaIcon.getSprite()); } } diff --git a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java index b3b1cb21..a2dcee0f 100644 --- a/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/PackageGenepool.java @@ -33,7 +33,7 @@ public class PackageGenepool extends GeneticMachine.PackageGeneticBase implement new ComponentGeneticGUI(machine, GeneticsGUI.Genepool); ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotEnzyme = inventory.addSlot(Genepool.SLOT_ENZYME, "enzyme"); - slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.IconEnzyme)); + slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.spriteEnzyme)); slotEnzyme.forbidExtraction(); InventorySlot slotProcess = inventory.addSlot(Genepool.SLOT_BEE, "process"); slotProcess.setValidator(new SlotValidator.Individual()); diff --git a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java index d2160899..11e6bb14 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/PackageInoculator.java @@ -34,7 +34,7 @@ public class PackageInoculator extends GeneticMachine.PackageGeneticBase impleme InventorySlot slotSerumVial = inventory.addSlot(Inoculator.SLOT_SERUM_VIAL, "serum.active"); slotSerumVial.forbidInteraction(); slotSerumVial.setReadOnly(); - final SlotValidator serumValid = new SlotValidator(ModuleMachine.iconSerum) { + final SlotValidator serumValid = new SlotValidator(ModuleMachine.spriteSerum) { @Override public boolean isValid(final ItemStack itemStack) { return itemStack.getItem() instanceof IItemSerum; diff --git a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java index 012e9a26..9d680eb5 100644 --- a/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/PackageIsolator.java @@ -34,10 +34,10 @@ public class PackageIsolator extends GeneticMachine.PackageGeneticBase implement new ComponentGeneticGUI(machine, GeneticsGUI.Isolator); final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotEnzyme = inventory.addSlot(Isolator.SLOT_ENZYME, "enzyme"); - slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.IconEnzyme)); + slotEnzyme.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.spriteEnzyme)); slotEnzyme.forbidExtraction(); InventorySlot slotSequencer = inventory.addSlot(Isolator.SLOT_SEQUENCER_VIAL, "sequencervial"); - slotSequencer.setValidator(new SlotValidator.Item(GeneticsItems.EmptySequencer.get(1), ModuleMachine.IconSequencer)); + slotSequencer.setValidator(new SlotValidator.Item(GeneticsItems.EmptySequencer.get(1), ModuleMachine.spriteSequencer)); slotSequencer.forbidExtraction(); for (InventorySlot slot : inventory.addSlotArray(Isolator.SLOT_RESERVE, "input")) { slot.setValidator(new SlotValidator.Individual()); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index 3bc93ae8..d49fc5c9 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -34,7 +34,7 @@ public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implem ComponentInventorySlots inventory = new ComponentInventorySlots(machine); //Slot Gold InventorySlot slotGold = inventory.addSlot(Polymeriser.SLOT_GOLD, "catalyst"); - slotGold.setValidator(new SlotValidator.Item(new ItemStack(Items.GOLD_NUGGET, 1), ModuleMachine.IconNugget)); + slotGold.setValidator(new SlotValidator.Item(new ItemStack(Items.GOLD_NUGGET, 1), ModuleMachine.spriteNugget)); slotGold.forbidExtraction(); //Slot Serum InventorySlot slotSerum = inventory.addSlot(Polymeriser.SLOT_SERUM, "process"); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java index ffa71e72..dc1b8e65 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; public class SlotValidatorUnfilledSerum extends SlotValidator { public SlotValidatorUnfilledSerum() { - super(ModuleMachine.iconSerum); + super(ModuleMachine.spriteSerum); } @Override diff --git a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java index cc18ef88..99b4a13a 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/PackageSequencer.java @@ -22,10 +22,10 @@ import net.minecraft.tileentity.TileEntity; public class PackageSequencer extends GeneticMachine.PackageGeneticBase implements IMachineInformation { public PackageSequencer() { super("sequencer", GeneticsTexture.Sequencer, 12058418, true); - Sequencer.fxSeqA = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.a"); - Sequencer.fxSeqG = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.g"); - Sequencer.fxSeqT = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.t"); - Sequencer.fxSeqC = Binnie.RESOURCE.getBlockIcon(Genetics.instance, "fx/sequencer.c"); + Sequencer.fxSeqA = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.a"); + Sequencer.fxSeqG = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.g"); + Sequencer.fxSeqT = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.t"); + Sequencer.fxSeqC = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.c"); } @Override @@ -33,7 +33,7 @@ public class PackageSequencer extends GeneticMachine.PackageGeneticBase implemen new ComponentGeneticGUI(machine, GeneticsGUI.Sequencer); ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotDye = inventory.addSlot(Sequencer.SLOT_DYE, "dye"); - slotDye.setValidator(new SlotValidator.Item(GeneticsItems.FluorescentDye.get(1), ModuleMachine.IconDye)); + slotDye.setValidator(new SlotValidator.Item(GeneticsItems.FluorescentDye.get(1), ModuleMachine.spriteDye)); slotDye.forbidExtraction(); for (InventorySlot slot : inventory.addSlotArray(Sequencer.SLOT_RESERVE, "input")) { slot.setValidator(new SlotValidatorUnsequenced()); diff --git a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java index 75dd78fa..8ff3d7ce 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java @@ -1,14 +1,14 @@ package binnie.genetics.machine.sequencer; -import binnie.core.resource.BinnieIcon; +import binnie.core.resource.BinnieSprite; public class Sequencer { public static final int SLOT_DYE = 0; public static final int[] SLOT_RESERVE = new int[]{1, 2, 3, 4}; public static final int SLOT_TARGET = 5; public static final int SLOT_DONE = 6; - public static BinnieIcon fxSeqA; - public static BinnieIcon fxSeqG; - public static BinnieIcon fxSeqT; - public static BinnieIcon fxSeqC; + public static BinnieSprite fxSeqA; + public static BinnieSprite fxSeqG; + public static BinnieSprite fxSeqT; + public static BinnieSprite fxSeqC; } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java index 8c090c9e..f65c67a7 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SlotValidatorUnsequenced.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; public class SlotValidatorUnsequenced extends SlotValidator { public SlotValidatorUnsequenced() { - super(ModuleMachine.IconSequencer); + super(ModuleMachine.spriteSequencer); } @Override diff --git a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java index 53985ce9..1fc37e4b 100644 --- a/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/PackageSplicer.java @@ -31,7 +31,7 @@ public class PackageSplicer extends AdvGeneticMachine.PackageAdvGeneticBase impl InventorySlot slotSerumVial = inventory.addSlot(Splicer.SLOT_SERUM_VIAL, "serum.active"); slotSerumVial.forbidInteraction(); slotSerumVial.setReadOnly(); - final SlotValidator serumValid = new SlotValidator(ModuleMachine.iconSerum) { + final SlotValidator serumValid = new SlotValidator(ModuleMachine.spriteSerum) { @Override public boolean isValid(final ItemStack itemStack) { return itemStack.getItem() instanceof IItemSerum; diff --git a/src/main/resources/assets/extratrees/textures/items/validator/polish.0.png b/src/main/resources/assets/extratrees/textures/items/validator/polish.0.png new file mode 100644 index 00000000..aea27d9e Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/validator/polish.0.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/validator/polish.1.png b/src/main/resources/assets/extratrees/textures/items/validator/polish.1.png new file mode 100644 index 00000000..fbc1804d Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/validator/polish.1.png differ