Clean Up BinnieSprite

This commit is contained in:
Nedelosk committed 2017-01-25 20:57:52 +01:00
1 parent 58c36b3c92
commit cdea827464
76 files changed
+228 -257

No files matched your search

+1 -1
View File
@@ -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();
}
@@ -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
+1 -1
View File
@@ -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
@@ -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
@@ -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<IClassification> allBranches;
List<IAlleleSpecies> allActiveSpecies;
private List<IAlleleSpecies> allSpecies;
@@ -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
@@ -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
@@ -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) {
@@ -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));
@@ -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
@@ -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;
@@ -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<ItemStack> {
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;
}
@@ -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<BinnieIcon> iconsInput;
private List<BinnieIcon> 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);
}
}
@@ -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<BinnieSprite> spritesInput;
private List<BinnieSprite> 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);
}
}
@@ -137,7 +137,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
this.sendToAll(packet);
}
public void registerIcon(ResourceLocation location) {
public void registerSprite(ResourceLocation location) {
}
@@ -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);
}
@@ -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;
// }
}
@@ -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());
}
}
@@ -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<BinnieIcon> icons;
private List<BinnieSprite> 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);
// }
// }
// }
}
@@ -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;
}
}
@@ -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);
}
}
@@ -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();
@@ -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");
}
}
@@ -37,7 +37,7 @@ public class AlvearyFrame {
public static class SlotValidatorFrame extends SlotValidator {
public SlotValidatorFrame() {
super(SlotValidator.IconFrame);
super(SlotValidator.spriteFrame);
}
@Override
@@ -43,7 +43,7 @@ public class AlvearyHatchery {
public static class SlotValidatorLarvae extends SlotValidator {
public SlotValidatorLarvae() {
super(SlotValidator.IconBee);
super(SlotValidator.spriteBee);
}
@Override
@@ -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
@@ -47,7 +47,7 @@ public class AlvearyStimulator {
public static class SlotValidatorCircuit extends SlotValidator {
public SlotValidatorCircuit() {
super(SlotValidator.IconCircuit);
super(SlotValidator.spriteCircuit);
}
@Override
@@ -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);
@@ -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;
@@ -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;
@@ -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
@@ -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;
}
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
public class SlotValidatorBreweryGrain extends SlotValidator {
public SlotValidatorBreweryGrain() {
super(SlotValidator.IconBlock);
super(SlotValidator.spriteBlock);
}
@Override
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
public class SlotValidatorBreweryIngredient extends SlotValidator {
public SlotValidatorBreweryIngredient() {
super(SlotValidator.IconBlock);
super(SlotValidator.spriteBlock);
}
@Override
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
public class SlotValidatorBreweryYeast extends SlotValidator {
public SlotValidatorBreweryYeast() {
super(SlotValidator.IconBlock);
super(SlotValidator.spriteBlock);
}
@Override
@@ -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;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.machines.Machine;
import binnie.core.util.ItemStackSet;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.machines.Machine;
import binnie.craftgui.core.CraftGUI;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.craftgui.core.Attribute;
import binnie.craftgui.core.CraftGUI;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.craftgui.core.CraftGUI;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.machines.Machine;
import binnie.core.machines.TileEntityMachine;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.craftgui.core.IWidget;
import binnie.craftgui.minecraft.Dialog;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.BinnieCore;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.craftgui.controls.ControlTextCentered;
import binnie.craftgui.core.IWidget;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.genetics.TreeBreedingSystem;
import binnie.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.AbstractMod;
import binnie.core.machines.Machine;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.AbstractMod;
import binnie.craftgui.minecraft.Window;
@@ -1,4 +1,4 @@
package binnie.extratrees.item.craftgui;
package binnie.extratrees.machines.craftgui;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
@@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack;
public class SlotValidatorSqueezable extends SlotValidator {
public SlotValidatorSqueezable() {
super(SlotValidator.IconBlock);
super(SlotValidator.spriteBlock);
}
@Override
@@ -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
@@ -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;
@@ -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));
}
}
@@ -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
@@ -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();
}
@@ -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));
@@ -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<IGene>, 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());
}
}
@@ -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());
@@ -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;
@@ -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());
@@ -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");
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
public class SlotValidatorUnfilledSerum extends SlotValidator {
public SlotValidatorUnfilledSerum() {
super(ModuleMachine.iconSerum);
super(ModuleMachine.spriteSerum);
}
@Override
@@ -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());
@@ -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;
}
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
public class SlotValidatorUnsequenced extends SlotValidator {
public SlotValidatorUnsequenced() {
super(ModuleMachine.IconSequencer);
super(ModuleMachine.spriteSequencer);
}
@Override
@@ -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;