mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 12:42:36 +00:00
Added item filter that only accepts items already in an inventory.
Fixed GUI alignment.
This commit is contained in:
1 parent
bdca623526
commit
135877c1be
30 files changed
+661
-228
No files matched your search
@@ -28,9 +28,10 @@ import crazypants.enderio.conduit.ConduitRecipes;
|
||||
import crazypants.enderio.conduit.facade.BlockConduitFacade;
|
||||
import crazypants.enderio.conduit.facade.ItemConduitFacade;
|
||||
import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
|
||||
import crazypants.enderio.conduit.item.ItemBasicItemFilter;
|
||||
import crazypants.enderio.conduit.item.ItemExtractSpeedUpgrade;
|
||||
import crazypants.enderio.conduit.item.ItemItemConduit;
|
||||
import crazypants.enderio.conduit.item.filter.ItemBasicItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ItemExistingItemFilter;
|
||||
import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
|
||||
import crazypants.enderio.conduit.power.ItemPowerConduit;
|
||||
import crazypants.enderio.conduit.redstone.ItemRedstoneConduit;
|
||||
@@ -142,6 +143,7 @@ public class EnderIO {
|
||||
public static ItemLiquidConduit itemLiquidConduit;
|
||||
public static ItemItemConduit itemItemConduit;
|
||||
public static ItemBasicItemFilter itemBasicFilterUpgrade;
|
||||
public static ItemExistingItemFilter itemExistingItemFilter;
|
||||
public static ItemExtractSpeedUpgrade itemExtractSpeedUpgrade;
|
||||
|
||||
// Machines
|
||||
@@ -253,7 +255,8 @@ public class EnderIO {
|
||||
itemLiquidConduit = ItemLiquidConduit.create();
|
||||
itemItemConduit = ItemItemConduit.create();
|
||||
|
||||
itemBasicFilterUpgrade = itemBasicFilterUpgrade.create();
|
||||
itemBasicFilterUpgrade = ItemBasicItemFilter.create();
|
||||
itemExistingItemFilter = ItemExistingItemFilter.create();
|
||||
itemExtractSpeedUpgrade = ItemExtractSpeedUpgrade.create();
|
||||
|
||||
Fluid f = new Fluid(Fluids.NUTRIENT_DISTILLATION_NAME).setDensity(1500).setViscosity(3000);
|
||||
|
||||
@@ -13,6 +13,7 @@ public enum ModObject {
|
||||
itemItemConduit,
|
||||
itemMeConduit,
|
||||
itemBasicFilterUpgrade,
|
||||
itemExistingItemFilter,
|
||||
itemExtractSpeedUpgrade,
|
||||
|
||||
// Power
|
||||
|
||||
@@ -13,10 +13,12 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.IConduitBundle;
|
||||
import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade;
|
||||
import crazypants.enderio.conduit.gui.item.InventorySpeedUpgrades;
|
||||
import crazypants.enderio.conduit.item.FilterRegister;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.ItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.gui.TemplateSlot;
|
||||
|
||||
public class ExternalConnectionContainer extends Container {
|
||||
@@ -80,7 +82,7 @@ public class ExternalConnectionContainer extends Container {
|
||||
slotLocations.add(new Point(x, y));
|
||||
|
||||
x = 28;
|
||||
y = 47;
|
||||
y = 47;
|
||||
final InventorySpeedUpgrades si = new InventorySpeedUpgrades(itemConduit, dir);
|
||||
addSlotToContainer(new Slot(si, 0, x, y) {
|
||||
|
||||
@@ -96,12 +98,16 @@ public class ExternalConnectionContainer extends Container {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void addFilterListener(FilterChangeListener list) {
|
||||
filterListeners.add(list);
|
||||
}
|
||||
|
||||
private void addFilterSlots(ForgeDirection dir) {
|
||||
|
||||
List<Slot> slots;
|
||||
inputFilter = itemConduit.getInputFilter(dir);
|
||||
if(inputFilter != null) {
|
||||
if(inputFilter != null && inputFilter.getSlotCount() > 0) {
|
||||
slots = inputFilter.getSlots();
|
||||
for (Slot slot : slots) {
|
||||
addSlotToContainer(slot);
|
||||
@@ -110,7 +116,7 @@ public class ExternalConnectionContainer extends Container {
|
||||
}
|
||||
|
||||
outputFilter = itemConduit.getOutputFilter(dir);
|
||||
if(outputFilter != null) {
|
||||
if(outputFilter != null && outputFilter.getSlotCount() > 0) {
|
||||
slots = outputFilter.getSlots();
|
||||
for (Slot slot : slots) {
|
||||
addSlotToContainer(slot);
|
||||
@@ -141,7 +147,7 @@ public class ExternalConnectionContainer extends Container {
|
||||
setSlotsVisible(visible, inputFilterUpgradeSlot, inputFilterUpgradeSlot + 1);
|
||||
setSlotsVisible(visible, speedUpgradeSlot, speedUpgradeSlot + 1);
|
||||
|
||||
if(inputFilter == null) {
|
||||
if(inputFilter == null || inputFilter.getSlotCount() == 0) {
|
||||
return;
|
||||
}
|
||||
int startIndex = startFilterSlot;
|
||||
@@ -158,7 +164,7 @@ public class ExternalConnectionContainer extends Container {
|
||||
|
||||
setSlotsVisible(visible, outputFilterUpgradeSlot, outputFilterUpgradeSlot + 1);
|
||||
|
||||
if(outputFilter == null) {
|
||||
if(outputFilter == null || outputFilter.getSlotCount() == 0) {
|
||||
return;
|
||||
}
|
||||
int startIndex = startFilterSlot + (inputFilter == null ? 0 : inputFilter.getSlotCount());
|
||||
|
||||
@@ -29,6 +29,12 @@ public class GuiExternalConnection extends GuiContainerBase {
|
||||
|
||||
private static final int TAB_HEIGHT = 24;
|
||||
|
||||
private static int nextButtonId = 1;
|
||||
|
||||
public static int nextButtonId() {
|
||||
return nextButtonId++;
|
||||
}
|
||||
|
||||
private static final Map<Class<? extends IConduit>, Integer> TAB_ORDER = new HashMap<Class<? extends IConduit>, Integer>();
|
||||
static {
|
||||
TAB_ORDER.put(IItemConduit.class, 0);
|
||||
@@ -37,17 +43,17 @@ public class GuiExternalConnection extends GuiContainerBase {
|
||||
TAB_ORDER.put(IPowerConduit.class, 3);
|
||||
}
|
||||
|
||||
InventoryPlayer playerInv;
|
||||
IConduitBundle bundle;
|
||||
ForgeDirection dir;
|
||||
final InventoryPlayer playerInv;
|
||||
final IConduitBundle bundle;
|
||||
private final ForgeDirection dir;
|
||||
|
||||
private List<IConduit> conduits = new ArrayList<IConduit>();
|
||||
private List<ISettingsPanel> tabs = new ArrayList<ISettingsPanel>();
|
||||
private final List<IConduit> conduits = new ArrayList<IConduit>();
|
||||
private final List<ISettingsPanel> tabs = new ArrayList<ISettingsPanel>();
|
||||
private int activeTab = 0;
|
||||
|
||||
private int tabYOffset = 4;
|
||||
|
||||
ExternalConnectionContainer container;
|
||||
private final ExternalConnectionContainer container;
|
||||
|
||||
public GuiExternalConnection(InventoryPlayer playerInv, IConduitBundle bundle, ForgeDirection dir) {
|
||||
super(new ExternalConnectionContainer(playerInv, bundle, dir));
|
||||
@@ -59,9 +65,9 @@ public class GuiExternalConnection extends GuiContainerBase {
|
||||
ySize = 166 + 29;
|
||||
xSize = 206;
|
||||
|
||||
container.setInputSlotsVisible(false);
|
||||
container.setOutputSlotsVisible(false);
|
||||
container.setInventorySlotsVisible(false);
|
||||
getContainer().setInputSlotsVisible(false);
|
||||
getContainer().setOutputSlotsVisible(false);
|
||||
getContainer().setInventorySlotsVisible(false);
|
||||
|
||||
List<IConduit> cons = new ArrayList<IConduit>(bundle.getConduits());
|
||||
Collections.sort(cons, new Comparator<IConduit>() {
|
||||
@@ -186,4 +192,12 @@ public class GuiExternalConnection extends GuiContainerBase {
|
||||
|
||||
}
|
||||
|
||||
public ForgeDirection getDir() {
|
||||
return dir;
|
||||
}
|
||||
|
||||
public ExternalConnectionContainer getContainer() {
|
||||
return container;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
|
||||
public interface IItemFilterGui {
|
||||
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import java.awt.Color;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.item.BaseSettingsPanel;
|
||||
import crazypants.enderio.conduit.liquid.ILiquidConduit;
|
||||
import crazypants.enderio.conduit.packet.PacketExtractMode;
|
||||
import crazypants.enderio.gui.ColorButton;
|
||||
@@ -19,9 +20,9 @@ import crazypants.util.Lang;
|
||||
|
||||
public class LiquidSettings extends BaseSettingsPanel {
|
||||
|
||||
static final int ID_REDSTONE_BUTTON = 16;
|
||||
static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId();
|
||||
|
||||
private static final int ID_COLOR_BUTTON = 17;
|
||||
private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();
|
||||
|
||||
private RedstoneModeButton rsB;
|
||||
|
||||
@@ -44,31 +45,31 @@ public class LiquidSettings extends BaseSettingsPanel {
|
||||
@Override
|
||||
public void setRedstoneControlMode(RedstoneControlMode mode) {
|
||||
RedstoneControlMode curMode = getRedstoneControlMode();
|
||||
conduit.setExtractionRedstoneMode(mode, gui.dir);
|
||||
conduit.setExtractionRedstoneMode(mode, gui.getDir());
|
||||
if(curMode != mode) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public RedstoneControlMode getRedstoneControlMode() {
|
||||
return conduit.getExtractionRedstoneMode(gui.dir);
|
||||
return conduit.getExtractionRedstoneMode(gui.getDir());
|
||||
}
|
||||
});
|
||||
|
||||
x += rsB.getWidth() + gap;
|
||||
colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y);
|
||||
colorB.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor"));
|
||||
colorB.setColorIndex(conduit.getExtractionSignalColor(gui.dir).ordinal());
|
||||
colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void actionPerformed(GuiButton guiButton) {
|
||||
super.actionPerformed(guiButton);
|
||||
if(guiButton.id == ID_COLOR_BUTTON) {
|
||||
conduit.setExtractionSignalColor(gui.dir, DyeColor.values()[colorB.getColorIndex()]);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir));
|
||||
conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,7 +95,7 @@ public class LiquidSettings extends BaseSettingsPanel {
|
||||
|
||||
@Override
|
||||
protected void renderCustomOptions(int top, float par1, int par2, int par3) {
|
||||
if(conduit.getConectionMode(gui.dir) == ConnectionMode.INPUT) {
|
||||
if(conduit.getConectionMode(gui.getDir()) == ConnectionMode.INPUT) {
|
||||
int x = gui.getGuiLeft() + gap + gui.getFontRenderer().getStringWidth(autoExtractStr) + gap + 2;
|
||||
int y = customTop;
|
||||
gui.getFontRenderer().drawString(autoExtractStr, left, top, ColorUtil.getRGB(Color.DARK_GRAY));
|
||||
|
||||
@@ -2,6 +2,7 @@ package crazypants.enderio.conduit.gui;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.item.BaseSettingsPanel;
|
||||
import crazypants.enderio.conduit.packet.PacketExtractMode;
|
||||
import crazypants.enderio.conduit.power.IPowerConduit;
|
||||
import crazypants.enderio.gui.ColorButton;
|
||||
@@ -15,9 +16,9 @@ import crazypants.util.Lang;
|
||||
|
||||
public class PowerSettings extends BaseSettingsPanel {
|
||||
|
||||
private static final int ID_REDSTONE_BUTTON = 796;
|
||||
private static final int ID_REDSTONE_BUTTON = GuiExternalConnection.nextButtonId();
|
||||
|
||||
private static final int ID_COLOR_BUTTON = 797;
|
||||
private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();
|
||||
|
||||
private IPowerConduit conduit;
|
||||
private RedstoneModeButton rsB;
|
||||
@@ -35,23 +36,23 @@ public class PowerSettings extends BaseSettingsPanel {
|
||||
@Override
|
||||
public void setRedstoneControlMode(RedstoneControlMode mode) {
|
||||
RedstoneControlMode curMode = getRedstoneControlMode();
|
||||
conduit.setExtractionRedstoneMode(mode, gui.dir);
|
||||
conduit.setExtractionRedstoneMode(mode, gui.getDir());
|
||||
if(curMode != mode) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public RedstoneControlMode getRedstoneControlMode() {
|
||||
return conduit.getExtractionRedstoneMode(gui.dir);
|
||||
return conduit.getExtractionRedstoneMode(gui.getDir());
|
||||
}
|
||||
});
|
||||
|
||||
x += rsB.getWidth() + gap;
|
||||
colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y);
|
||||
colorB.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor"));
|
||||
colorB.setColorIndex(conduit.getExtractionSignalColor(gui.dir).ordinal());
|
||||
colorB.setColorIndex(conduit.getExtractionSignalColor(gui.getDir()).ordinal());
|
||||
|
||||
}
|
||||
|
||||
@@ -59,8 +60,8 @@ public class PowerSettings extends BaseSettingsPanel {
|
||||
public void actionPerformed(GuiButton guiButton) {
|
||||
super.actionPerformed(guiButton);
|
||||
if(guiButton.id == ID_COLOR_BUTTON) {
|
||||
conduit.setExtractionSignalColor(gui.dir, DyeColor.values()[colorB.getColorIndex()]);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.dir));
|
||||
conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.awt.Color;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.item.BaseSettingsPanel;
|
||||
import crazypants.enderio.conduit.packet.PacketRedstoneConduitSignalColor;
|
||||
import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
|
||||
import crazypants.enderio.gui.ColorButton;
|
||||
@@ -15,7 +16,7 @@ import crazypants.util.Lang;
|
||||
|
||||
public class RedstoneSettings extends BaseSettingsPanel {
|
||||
|
||||
private static final int ID_COLOR_BUTTON = 163;
|
||||
private static final int ID_COLOR_BUTTON = GuiExternalConnection.nextButtonId();
|
||||
private ColorButton cb;
|
||||
|
||||
private String signalColorStr = Lang.localize("gui.conduit.redstone.color");
|
||||
@@ -30,7 +31,7 @@ public class RedstoneSettings extends BaseSettingsPanel {
|
||||
cb.setToolTipHeading(Lang.localize("gui.conduit.redstone.signalColor"));
|
||||
if(con instanceof IInsulatedRedstoneConduit) {
|
||||
insCon = (IInsulatedRedstoneConduit) con;
|
||||
DyeColor sigCol = insCon.getSignalColor(gui.dir);
|
||||
DyeColor sigCol = insCon.getSignalColor(gui.getDir());
|
||||
cb.setColorIndex(sigCol.ordinal());
|
||||
}
|
||||
}
|
||||
@@ -39,7 +40,7 @@ public class RedstoneSettings extends BaseSettingsPanel {
|
||||
public void actionPerformed(GuiButton guiButton) {
|
||||
super.actionPerformed(guiButton);
|
||||
if(guiButton.id == ID_COLOR_BUTTON) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.getDir()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.item.ItemSettings;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.liquid.ILiquidConduit;
|
||||
import crazypants.enderio.conduit.power.IPowerConduit;
|
||||
|
||||
+15
-11
@@ -1,15 +1,18 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraftforge.event.terraingen.BiomeEvent.GetGrassColor;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.GuiExternalConnection;
|
||||
import crazypants.enderio.conduit.gui.ISettingsPanel;
|
||||
import crazypants.enderio.conduit.packet.PacketConnectionMode;
|
||||
import crazypants.enderio.gui.IconButtonEIO;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
@@ -76,7 +79,7 @@ public class BaseSettingsPanel implements ISettingsPanel {
|
||||
rightArrow.onGuiInit();
|
||||
|
||||
FontRenderer fr = gui.getFontRenderer();
|
||||
connectionModeChanged(con.getConectionMode(gui.dir));
|
||||
connectionModeChanged(con.getConectionMode(gui.getDir()));
|
||||
|
||||
initCustomOptions();
|
||||
}
|
||||
@@ -96,14 +99,14 @@ public class BaseSettingsPanel implements ISettingsPanel {
|
||||
@Override
|
||||
public void actionPerformed(GuiButton guiButton) {
|
||||
if(guiButton.id == PREV_MODE_B) {
|
||||
con.setConnectionMode(gui.dir, con.getPreviousConnectionMode(gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.dir));
|
||||
connectionModeChanged(con.getConectionMode(gui.dir));
|
||||
con.setConnectionMode(gui.getDir(), con.getPreviousConnectionMode(gui.getDir()));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.getDir()));
|
||||
connectionModeChanged(con.getConectionMode(gui.getDir()));
|
||||
|
||||
} else if(guiButton.id == NEXT_MODE_B) {
|
||||
con.setConnectionMode(gui.dir, con.getNextConnectionMode(gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.dir));
|
||||
connectionModeChanged(con.getConectionMode(gui.dir));
|
||||
con.setConnectionMode(gui.getDir(), con.getNextConnectionMode(gui.getDir()));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketConnectionMode(con, gui.getDir()));
|
||||
connectionModeChanged(con.getConectionMode(gui.getDir()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,15 +123,16 @@ public class BaseSettingsPanel implements ISettingsPanel {
|
||||
//fr.drawString(getTypeName(), x, top, rgb);
|
||||
|
||||
x = left;
|
||||
int y = customTop + 8;//gap + fr.FONT_HEIGHT + gap;
|
||||
|
||||
int y = gui.getGuiTop() + 13;//customTop + 8;//gap + fr.FONT_HEIGHT + gap;
|
||||
gui.getFontRenderer().drawString(modeLabel, x, y, rgb);
|
||||
|
||||
String modeString = con.getConectionMode(gui.dir).getLocalisedName();
|
||||
String modeString = con.getConectionMode(gui.getDir()).getLocalisedName();
|
||||
x += gap + leftArrow.getWidth() + fr.getStringWidth(modeLabel) + gap;
|
||||
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
IconEIO icon = new IconEIO(10, 60, 64, 20);
|
||||
icon.renderIcon(x - gap, y - (fr.FONT_HEIGHT / 2) - 1, getLongestModeStringWidth() + gap * 2, leftArrow.getHeight(), 0, true);
|
||||
icon.renderIcon(x - gap, y - (fr.FONT_HEIGHT / 2) - 1, getLongestModeStringWidth() + gap * 2, leftArrow.getHeight(), 0, true);
|
||||
|
||||
int move = (getLongestModeStringWidth() - fr.getStringWidth(modeString)) / 2;
|
||||
x += move;
|
||||
+14
-18
@@ -1,31 +1,27 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.GuiExternalConnection;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.ItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
|
||||
import crazypants.enderio.gui.ColorButton;
|
||||
import crazypants.enderio.gui.IconButtonEIO;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
import crazypants.enderio.gui.ToggleButtonEIO;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.render.RenderUtil;
|
||||
import crazypants.util.DyeColor;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
public class BasicItemFilterGui {
|
||||
public class BasicItemFilterGui implements IItemFilterGui {
|
||||
|
||||
private static final int ID_WHITELIST = 17;
|
||||
private static final int ID_NBT = 18;
|
||||
private static final int ID_META = 19;
|
||||
private static final int ID_ORE_DICT = 20;
|
||||
private static final int ID_STICKY = 21;
|
||||
private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_NBT = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_META = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_STICKY = GuiExternalConnection.nextButtonId();
|
||||
|
||||
private IItemConduit itemConduit;
|
||||
private GuiExternalConnection gui;
|
||||
@@ -47,9 +43,9 @@ public class BasicItemFilterGui {
|
||||
this.isInput = isInput;
|
||||
|
||||
if(isInput) {
|
||||
filter = (ItemFilter) itemConduit.getInputFilter(gui.dir);
|
||||
filter = (ItemFilter) itemConduit.getInputFilter(gui.getDir());
|
||||
} else {
|
||||
filter = (ItemFilter) itemConduit.getOutputFilter(gui.dir);
|
||||
filter = (ItemFilter) itemConduit.getOutputFilter(gui.getDir());
|
||||
}
|
||||
isAdvanced = filter.isAdvanced();
|
||||
|
||||
@@ -141,7 +137,7 @@ public class BasicItemFilterGui {
|
||||
|
||||
private void sendFilterChange() {
|
||||
updateButtons();
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
}
|
||||
|
||||
public void deactivate() {
|
||||
@@ -0,0 +1,138 @@
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import crazypants.enderio.conduit.gui.GuiExternalConnection;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.filter.ExistingItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
|
||||
import crazypants.enderio.gui.IconButtonEIO;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
import crazypants.enderio.gui.ToggleButtonEIO;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.render.RenderUtil;
|
||||
import crazypants.util.Lang;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
|
||||
public class ExistingItemFilterGui implements IItemFilterGui {
|
||||
|
||||
private static final int ID_NBT = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_META = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId();
|
||||
private static final int ID_STICKY = GuiExternalConnection.nextButtonId();
|
||||
|
||||
private IItemConduit itemConduit;
|
||||
private GuiExternalConnection gui;
|
||||
|
||||
private ToggleButtonEIO useMetaB;
|
||||
private ToggleButtonEIO useNbtB;
|
||||
private ToggleButtonEIO useOreDictB;
|
||||
private ToggleButtonEIO stickyB;
|
||||
|
||||
boolean isInput;
|
||||
|
||||
private ExistingItemFilter filter;
|
||||
|
||||
public ExistingItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
|
||||
this.gui = gui;
|
||||
this.itemConduit = itemConduit;
|
||||
this.isInput = isInput;
|
||||
|
||||
if(isInput) {
|
||||
filter = (ExistingItemFilter) itemConduit.getInputFilter(gui.getDir());
|
||||
} else {
|
||||
filter = (ExistingItemFilter) itemConduit.getOutputFilter(gui.getDir());
|
||||
}
|
||||
|
||||
int butLeft = 37;
|
||||
int x = butLeft;
|
||||
int y = 58;
|
||||
|
||||
useMetaB = new ToggleButtonEIO(gui, ID_META, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
|
||||
useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData"));
|
||||
useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData"));
|
||||
useMetaB.setPaintSelectedBorder(false);
|
||||
|
||||
x += 20;
|
||||
stickyB = new ToggleButtonEIO(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY);
|
||||
String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled");
|
||||
stickyB.setSelectedToolTip(lines);
|
||||
stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled"));
|
||||
stickyB.setPaintSelectedBorder(false);
|
||||
|
||||
y += 20;
|
||||
x = butLeft;
|
||||
|
||||
x += 20;
|
||||
useNbtB = new ToggleButtonEIO(gui, ID_NBT, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT);
|
||||
useNbtB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchNBT"));
|
||||
useNbtB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreNBT"));
|
||||
useNbtB.setPaintSelectedBorder(false);
|
||||
|
||||
x = butLeft;
|
||||
useOreDictB = new ToggleButtonEIO(gui, ID_ORE_DICT, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT);
|
||||
useOreDictB.setSelectedToolTip(Lang.localize("gui.conduit.item.oreDicEnabled"));
|
||||
useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled"));
|
||||
useOreDictB.setPaintSelectedBorder(false);
|
||||
}
|
||||
|
||||
public void updateButtons() {
|
||||
|
||||
ExistingItemFilter activeFilter = filter;
|
||||
|
||||
useNbtB.onGuiInit();
|
||||
useNbtB.setSelected(activeFilter.isMatchNBT());
|
||||
|
||||
useOreDictB.onGuiInit();
|
||||
useOreDictB.setSelected(activeFilter.isUseOreDict());
|
||||
|
||||
if(!isInput) {
|
||||
stickyB.onGuiInit();
|
||||
stickyB.setSelected(activeFilter.isSticky());
|
||||
}
|
||||
|
||||
useMetaB.onGuiInit();
|
||||
useMetaB.setSelected(activeFilter.isMatchMeta());
|
||||
|
||||
}
|
||||
|
||||
public void actionPerformed(GuiButton guiButton) {
|
||||
|
||||
if(guiButton.id == ID_META) {
|
||||
filter.setMatchMeta(useMetaB.isSelected());
|
||||
sendFilterChange();
|
||||
} else if(guiButton.id == ID_NBT) {
|
||||
filter.setMatchNBT(useNbtB.isSelected());
|
||||
sendFilterChange();
|
||||
} else if(guiButton.id == ID_STICKY) {
|
||||
filter.setSticky(stickyB.isSelected());
|
||||
sendFilterChange();
|
||||
} else if(guiButton.id == ID_ORE_DICT) {
|
||||
filter.setUseOreDict(useOreDictB.isSelected());
|
||||
sendFilterChange();
|
||||
}
|
||||
}
|
||||
|
||||
private void sendFilterChange() {
|
||||
updateButtons();
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
System.out.println("ExistingItemFilterGui.enclosing_method: ");
|
||||
}
|
||||
|
||||
public void deactivate() {
|
||||
useNbtB.detach();
|
||||
useMetaB.detach();
|
||||
useOreDictB.detach();
|
||||
stickyB.detach();
|
||||
}
|
||||
|
||||
public void renderCustomOptions(int top, float par1, int par2, int par3) {
|
||||
// GL11.glColor3f(1, 1, 1);
|
||||
// RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png");
|
||||
// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18);
|
||||
// if(filter.isAdvanced()) {
|
||||
// gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18);
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
|
||||
public interface IItemFilterGui {
|
||||
|
||||
void deactivate();
|
||||
|
||||
void updateButtons();
|
||||
|
||||
void actionPerformed(GuiButton guiButton);
|
||||
|
||||
void renderCustomOptions(int top, float par1, int par2, int par3);
|
||||
|
||||
}
|
||||
+3
-3
@@ -1,11 +1,11 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.IItemFilterUpgrade;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade;
|
||||
|
||||
public class InventoryFilterUpgrade implements IInventory {
|
||||
|
||||
@@ -13,7 +13,7 @@ public class InventoryFilterUpgrade implements IInventory {
|
||||
final ForgeDirection dir;
|
||||
final boolean isInput;
|
||||
|
||||
InventoryFilterUpgrade(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) {
|
||||
public InventoryFilterUpgrade(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) {
|
||||
this.itemConduit = itemConduit;
|
||||
this.dir = dir;
|
||||
this.isInput = isInput;
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
@@ -7,12 +7,12 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
|
||||
class InventorySpeedUpgrades implements IInventory {
|
||||
public class InventorySpeedUpgrades implements IInventory {
|
||||
|
||||
IItemConduit itemConduit;
|
||||
ForgeDirection dir;
|
||||
|
||||
InventorySpeedUpgrades(IItemConduit itemConduit, ForgeDirection dir) {
|
||||
public InventorySpeedUpgrades(IItemConduit itemConduit, ForgeDirection dir) {
|
||||
this.itemConduit = itemConduit;
|
||||
this.dir = dir;
|
||||
}
|
||||
+72
-59
@@ -1,4 +1,4 @@
|
||||
package crazypants.enderio.conduit.gui;
|
||||
package crazypants.enderio.conduit.gui.item;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Rectangle;
|
||||
@@ -10,9 +10,12 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.gui.FilterChangeListener;
|
||||
import crazypants.enderio.conduit.gui.GuiExternalConnection;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.ItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ExistingItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.enderio.conduit.packet.PacketExtractMode;
|
||||
import crazypants.enderio.conduit.packet.PacketItemConduitFilter;
|
||||
import crazypants.enderio.gui.ColorButton;
|
||||
@@ -70,9 +73,9 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
|
||||
private GuiToolTip priorityTooltip;
|
||||
|
||||
private BasicItemFilterGui filterGui;
|
||||
private IItemFilterGui filterGui;
|
||||
|
||||
protected ItemSettings(final GuiExternalConnection gui, IConduit con) {
|
||||
public ItemSettings(final GuiExternalConnection gui, IConduit con) {
|
||||
super(IconEIO.WRENCH_OVERLAY_ITEM, Lang.localize("itemItemConduit.name"), gui, con);
|
||||
itemConduit = (IItemConduit) con;
|
||||
|
||||
@@ -98,22 +101,22 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
@Override
|
||||
public void setRedstoneControlMode(RedstoneControlMode mode) {
|
||||
RedstoneControlMode curMode = getRedstoneControlMode();
|
||||
itemConduit.setExtractionRedstoneMode(mode, gui.dir);
|
||||
itemConduit.setExtractionRedstoneMode(mode, gui.getDir());
|
||||
if(curMode != mode) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public RedstoneControlMode getRedstoneControlMode() {
|
||||
return itemConduit.getExtractionRedstoneMode(gui.dir);
|
||||
return itemConduit.getExtractionRedstoneMode(gui.getDir());
|
||||
}
|
||||
});
|
||||
|
||||
x += rsB.getWidth() + 4;
|
||||
colorB = new ColorButton(gui, ID_COLOR_BUTTON, x, y);
|
||||
colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.dir).ordinal());
|
||||
colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal());
|
||||
colorB.setToolTipHeading(Lang.localize("gui.conduit.item.sigCol"));
|
||||
|
||||
x += 4 + colorB.getWidth();
|
||||
@@ -138,7 +141,7 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
|
||||
priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 20), Lang.localize("gui.conduit.item.priority"));
|
||||
|
||||
gui.container.filterListeners.add(new FilterChangeListener() {
|
||||
gui.getContainer().addFilterListener(new FilterChangeListener() {
|
||||
|
||||
@Override
|
||||
public void onFilterChanged() {
|
||||
@@ -150,7 +153,7 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
}
|
||||
|
||||
private String getHeading() {
|
||||
ConnectionMode mode = con.getConectionMode(gui.dir);
|
||||
ConnectionMode mode = con.getConectionMode(gui.getDir());
|
||||
if(mode == ConnectionMode.DISABLED) {
|
||||
return "";
|
||||
}
|
||||
@@ -175,7 +178,7 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
boolean showInput = false;
|
||||
boolean showOutput = false;
|
||||
|
||||
ConnectionMode mode = con.getConectionMode(gui.dir);
|
||||
ConnectionMode mode = con.getConectionMode(gui.getDir());
|
||||
if(mode == ConnectionMode.INPUT) {
|
||||
showInput = true;
|
||||
} else if(mode == ConnectionMode.OUTPUT) {
|
||||
@@ -195,21 +198,21 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
filterGui = null;
|
||||
activeFilter = null;
|
||||
} else if(showInput) {
|
||||
activeFilter = itemConduit.getInputFilter(gui.dir);
|
||||
gui.container.setInventorySlotsVisible(true);
|
||||
gui.container.setInputSlotsVisible(true);
|
||||
gui.container.setOutputSlotsVisible(false);
|
||||
activeFilter = itemConduit.getInputFilter(gui.getDir());
|
||||
gui.getContainer().setInventorySlotsVisible(true);
|
||||
gui.getContainer().setInputSlotsVisible(true);
|
||||
gui.getContainer().setOutputSlotsVisible(false);
|
||||
if(activeFilter != null) {
|
||||
filterGui = new BasicItemFilterGui(gui, itemConduit, true);
|
||||
filterGui = getFilterGui(activeFilter, true);
|
||||
|
||||
}
|
||||
} else if(showOutput) {
|
||||
activeFilter = itemConduit.getOutputFilter(gui.dir);
|
||||
gui.container.setInputSlotsVisible(false);
|
||||
gui.container.setOutputSlotsVisible(true);
|
||||
gui.container.setInventorySlotsVisible(true);
|
||||
activeFilter = itemConduit.getOutputFilter(gui.getDir());
|
||||
gui.getContainer().setInputSlotsVisible(false);
|
||||
gui.getContainer().setOutputSlotsVisible(true);
|
||||
gui.getContainer().setInventorySlotsVisible(true);
|
||||
if(activeFilter != null) {
|
||||
filterGui = new BasicItemFilterGui(gui, itemConduit, false);
|
||||
filterGui = getFilterGui(activeFilter, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -223,29 +226,29 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
filterGui = null;
|
||||
}
|
||||
|
||||
ConnectionMode mode = con.getConectionMode(gui.dir);
|
||||
ConnectionMode mode = con.getConectionMode(gui.getDir());
|
||||
if(mode == ConnectionMode.DISABLED) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean showInput = mode == ConnectionMode.INPUT || (mode == ConnectionMode.IN_OUT && inOutShowIn);
|
||||
if(showInput) {
|
||||
gui.container.setInventorySlotsVisible(true);
|
||||
gui.container.setInputSlotsVisible(true);
|
||||
gui.container.setOutputSlotsVisible(false);
|
||||
gui.getContainer().setInventorySlotsVisible(true);
|
||||
gui.getContainer().setInputSlotsVisible(true);
|
||||
gui.getContainer().setOutputSlotsVisible(false);
|
||||
|
||||
activeFilter = itemConduit.getInputFilter(gui.dir);
|
||||
activeFilter = itemConduit.getInputFilter(gui.getDir());
|
||||
if(activeFilter != null) {
|
||||
filterGui = new BasicItemFilterGui(gui, itemConduit, true);
|
||||
filterGui = getFilterGui(activeFilter, true);
|
||||
}
|
||||
} else {
|
||||
gui.container.setInventorySlotsVisible(true);
|
||||
gui.container.setInputSlotsVisible(false);
|
||||
gui.container.setOutputSlotsVisible(true);
|
||||
gui.getContainer().setInventorySlotsVisible(true);
|
||||
gui.getContainer().setInputSlotsVisible(false);
|
||||
gui.getContainer().setOutputSlotsVisible(true);
|
||||
|
||||
activeFilter = itemConduit.getOutputFilter(gui.dir);
|
||||
activeFilter = itemConduit.getOutputFilter(gui.getDir());
|
||||
if(activeFilter != null) {
|
||||
filterGui = new BasicItemFilterGui(gui, itemConduit, false);
|
||||
filterGui = getFilterGui(activeFilter, false);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -255,9 +258,19 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
|
||||
}
|
||||
|
||||
private IItemFilterGui getFilterGui(IItemFilter filter, boolean isInput) {
|
||||
//TODO: move to a factory
|
||||
if(filter instanceof ItemFilter) {
|
||||
return new BasicItemFilterGui(gui, itemConduit, isInput);
|
||||
} else if(filter instanceof ExistingItemFilter) {
|
||||
return new ExistingItemFilterGui(gui, itemConduit, isInput);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private void updateButtons() {
|
||||
|
||||
ConnectionMode mode = con.getConectionMode(gui.dir);
|
||||
ConnectionMode mode = con.getConectionMode(gui.getDir());
|
||||
if(mode == ConnectionMode.DISABLED) {
|
||||
return;
|
||||
}
|
||||
@@ -266,20 +279,20 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
if(!outputActive) {
|
||||
|
||||
rsB.onGuiInit();
|
||||
rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.dir));
|
||||
rsB.setMode(itemConduit.getExtractionRedstoneMode(gui.getDir()));
|
||||
|
||||
colorB.onGuiInit();
|
||||
colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.dir).ordinal());
|
||||
colorB.setColorIndex(itemConduit.getExtractionSignalColor(gui.getDir()).ordinal());
|
||||
}
|
||||
|
||||
if(mode == ConnectionMode.IN_OUT && !outputActive) {
|
||||
loopB.onGuiInit();
|
||||
loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.dir));
|
||||
loopB.setSelected(itemConduit.isSelfFeedEnabled(gui.getDir()));
|
||||
}
|
||||
|
||||
if((mode == ConnectionMode.IN_OUT && !outputActive) || mode == ConnectionMode.INPUT) {
|
||||
roundRobinB.onGuiInit();
|
||||
roundRobinB.setSelected(itemConduit.isRoundRobinEnabled(gui.dir));
|
||||
roundRobinB.setSelected(itemConduit.isRoundRobinEnabled(gui.getDir()));
|
||||
}
|
||||
|
||||
if((mode == ConnectionMode.IN_OUT && outputActive) || mode == ConnectionMode.OUTPUT) {
|
||||
@@ -290,9 +303,9 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
|
||||
int chanCol;
|
||||
if(!outputActive) {
|
||||
chanCol = itemConduit.getInputColor(gui.dir).ordinal();
|
||||
chanCol = itemConduit.getInputColor(gui.getDir()).ordinal();
|
||||
} else {
|
||||
chanCol = itemConduit.getOutputColor(gui.dir).ordinal();
|
||||
chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal();
|
||||
}
|
||||
channelB.onGuiInit();
|
||||
channelB.setColorIndex(chanCol);
|
||||
@@ -310,33 +323,33 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
inOutShowIn = !inOutShowIn;
|
||||
updateGuiVisibility();
|
||||
} else if(guiButton.id == ID_COLOR_BUTTON) {
|
||||
itemConduit.setExtractionSignalColor(gui.dir, DyeColor.values()[colorB.getColorIndex()]);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.dir));
|
||||
itemConduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(itemConduit, gui.getDir()));
|
||||
} else if(guiButton.id == ID_LOOP) {
|
||||
itemConduit.setSelfFeedEnabled(gui.dir, !itemConduit.isSelfFeedEnabled(gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir));
|
||||
itemConduit.setSelfFeedEnabled(gui.getDir(), !itemConduit.isSelfFeedEnabled(gui.getDir()));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
} else if(guiButton.id == ID_ROUND_ROBIN) {
|
||||
itemConduit.setRoundRobinEnabled(gui.dir, !itemConduit.isRoundRobinEnabled(gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir));
|
||||
itemConduit.setRoundRobinEnabled(gui.getDir(), !itemConduit.isRoundRobinEnabled(gui.getDir()));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
} else if(guiButton.id == ID_PRIORITY_UP) {
|
||||
itemConduit.setOutputPriority(gui.dir, itemConduit.getOutputPriority(gui.dir) + 1);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir));
|
||||
itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) + 1);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
} else if(guiButton.id == ID_PRIORITY_DOWN) {
|
||||
itemConduit.setOutputPriority(gui.dir, itemConduit.getOutputPriority(gui.dir) - 1);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir));
|
||||
itemConduit.setOutputPriority(gui.getDir(), itemConduit.getOutputPriority(gui.getDir()) - 1);
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
} else if(guiButton.id == ID_CHANNEL) {
|
||||
|
||||
DyeColor col = DyeColor.values()[channelB.getColorIndex()];
|
||||
boolean input;
|
||||
if(isInputVisible()) {
|
||||
col = DyeColor.values()[channelB.getColorIndex()];
|
||||
itemConduit.setInputColor(gui.dir, col);
|
||||
itemConduit.setInputColor(gui.getDir(), col);
|
||||
input = true;
|
||||
} else {
|
||||
itemConduit.setOutputColor(gui.dir, DyeColor.values()[channelB.getColorIndex()]);
|
||||
itemConduit.setOutputColor(gui.getDir(), DyeColor.values()[channelB.getColorIndex()]);
|
||||
input = false;
|
||||
}
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir));
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir()));
|
||||
}
|
||||
|
||||
if(filterGui != null) {
|
||||
@@ -345,7 +358,7 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
}
|
||||
|
||||
private boolean isInputVisible() {
|
||||
ConnectionMode mode = con.getConectionMode(gui.dir);
|
||||
ConnectionMode mode = con.getConectionMode(gui.getDir());
|
||||
return (mode == ConnectionMode.IN_OUT && inOutShowIn) || (mode == ConnectionMode.INPUT);
|
||||
}
|
||||
|
||||
@@ -357,7 +370,7 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
|
||||
@Override
|
||||
protected void renderCustomOptions(int top, float par1, int par2, int par3) {
|
||||
ConnectionMode mode = con.getConectionMode(gui.dir);
|
||||
ConnectionMode mode = con.getConectionMode(gui.getDir());
|
||||
if(mode == ConnectionMode.DISABLED) {
|
||||
return;
|
||||
}
|
||||
@@ -376,7 +389,7 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
if(outputActive) {
|
||||
GL11.glColor3f(1, 1, 1);
|
||||
IconEIO.BUTTON_DOWN.renderIcon(left + priLeft, top - 5, priWidth, 16, 0, true);
|
||||
String str = itemConduit.getOutputPriority(gui.dir) + "";
|
||||
String str = itemConduit.getOutputPriority(gui.getDir()) + "";
|
||||
int sw = fr.getStringWidth(str);
|
||||
fr.drawString(str, left + priLeft + priWidth - sw - gap, top, ColorUtil.getRGB(Color.black));
|
||||
|
||||
@@ -400,9 +413,9 @@ public class ItemSettings extends BaseSettingsPanel {
|
||||
|
||||
@Override
|
||||
public void deactivate() {
|
||||
gui.container.setInventorySlotsVisible(false);
|
||||
gui.container.setInputSlotsVisible(false);
|
||||
gui.container.setOutputSlotsVisible(false);
|
||||
gui.getContainer().setInventorySlotsVisible(false);
|
||||
gui.getContainer().setInputSlotsVisible(false);
|
||||
gui.getContainer().setOutputSlotsVisible(false);
|
||||
rsB.detach();
|
||||
colorB.detach();
|
||||
roundRobinB.detach();
|
||||
@@ -5,11 +5,88 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import crazypants.enderio.Log;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilterUpgrade;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.enderio.network.NetworkUtil;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class FilterRegister {
|
||||
|
||||
public static IItemFilter getFilterForUpgrade(ItemStack stack) {
|
||||
if(stack == null) {
|
||||
return null;
|
||||
}
|
||||
if(!(stack.getItem() instanceof IItemFilterUpgrade)) {
|
||||
return null;
|
||||
}
|
||||
IItemFilterUpgrade upgrade = (IItemFilterUpgrade)stack.getItem();
|
||||
IItemFilter res = upgrade.createFilterFromStack(stack);
|
||||
return res;
|
||||
}
|
||||
|
||||
public static boolean isFilterSet(ItemStack stack) {
|
||||
return stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter");
|
||||
}
|
||||
|
||||
public static void writeFilterToStack(IItemFilter filter, ItemStack stack) {
|
||||
if(stack == null || filter == null) {
|
||||
return;
|
||||
}
|
||||
NBTTagCompound filterRoot = new NBTTagCompound();
|
||||
writeFilterToNbt(filter, filterRoot);
|
||||
if(stack.stackTagCompound == null) {
|
||||
stack.stackTagCompound = new NBTTagCompound();
|
||||
}
|
||||
stack.stackTagCompound.setTag("filter", filterRoot);
|
||||
}
|
||||
|
||||
public static void writeFilterToNbt(IItemFilter filter, NBTTagCompound filterTag) {
|
||||
filterTag.setString("filterClass", filter.getClass().getName());
|
||||
filter.writeToNBT(filterTag);
|
||||
}
|
||||
|
||||
public static IItemFilter loadFilterFromNbt(NBTTagCompound filterTag) {
|
||||
if(filterTag == null) {
|
||||
return null;
|
||||
}
|
||||
IItemFilter filter;
|
||||
//legacy support for release where class names where not stored
|
||||
if(!filterTag.hasKey("filterClass")) {
|
||||
filter = null;
|
||||
Log.warn("Could not load old version of item filter.");
|
||||
} else {
|
||||
String className = filterTag.getString("filterClass");
|
||||
filter = loadFilterFromNbt(className, filterTag);
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
|
||||
private static IItemFilter loadFilterFromNbt(String className, NBTTagCompound tag) {
|
||||
try {
|
||||
Class<?> clz = Class.forName(className);
|
||||
IItemFilter filter = (IItemFilter) clz.newInstance();
|
||||
filter.readFromNBT(tag);
|
||||
return filter;
|
||||
} catch (Exception e) {
|
||||
Log.error("Could not read item filter with class name: " + className + " from NBT: " + tag + " Error: " + e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static void updateLegacyFilterNbt(NBTTagCompound filterTag, int conduitMeta) {
|
||||
if(filterTag == null) {
|
||||
return;
|
||||
}
|
||||
if(!filterTag.hasKey("filterClass")) {
|
||||
filterTag.setString("filterClass", ItemFilter.class.getName());
|
||||
}
|
||||
if(!filterTag.hasKey("isAdvanced")) {
|
||||
filterTag.setBoolean("isAdvanced", conduitMeta == 1);
|
||||
}
|
||||
}
|
||||
|
||||
public static void writeFilter(ByteBuf buf, IItemFilter filter) {
|
||||
if(filter == null) {
|
||||
ByteBufUtils.writeUTF8String(buf, "nullFilter");
|
||||
@@ -29,49 +106,7 @@ public class FilterRegister {
|
||||
return null;
|
||||
}
|
||||
NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf);
|
||||
try {
|
||||
Class<?> clz = Class.forName(className);
|
||||
IItemFilter filter = (IItemFilter) clz.newInstance();
|
||||
filter.readFromNBT(tag);
|
||||
return filter;
|
||||
} catch (Exception e) {
|
||||
Log.error("Could not read item filter: " + e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static IItemFilter getFilterForUpgrade(ItemStack stack) {
|
||||
if(stack == null) {
|
||||
return null;
|
||||
}
|
||||
if( ! (stack.getItem() instanceof IItemFilterUpgrade) ) {
|
||||
return null;
|
||||
}
|
||||
IItemFilterUpgrade upgrade = (IItemFilterUpgrade)stack.getItem();
|
||||
IItemFilter res = upgrade.createFilterFromStack(stack);
|
||||
return res;
|
||||
}
|
||||
|
||||
public static void loadFilterFromStack(IItemFilter filter, ItemStack stack) {
|
||||
if(stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
|
||||
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
|
||||
}
|
||||
return loadFilterFromNbt(className, tag);
|
||||
}
|
||||
|
||||
public static void writeFilterToStack(IItemFilter filter, ItemStack stack) {
|
||||
if(stack == null || filter == null) {
|
||||
return;
|
||||
}
|
||||
NBTTagCompound filterRoot = new NBTTagCompound();
|
||||
filter.writeToNBT(filterRoot);
|
||||
if(stack.stackTagCompound == null) {
|
||||
stack.stackTagCompound = new NBTTagCompound();
|
||||
}
|
||||
stack.stackTagCompound.setTag("filter", filterRoot);
|
||||
}
|
||||
|
||||
public static boolean isFilterSet(ItemStack stack) {
|
||||
return stack != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import cofh.api.transport.IItemDuct;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.IExtractor;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.util.DyeColor;
|
||||
|
||||
public interface IItemConduit extends IConduit, IItemDuct, IExtractor {
|
||||
|
||||
@@ -27,6 +27,8 @@ import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.IConduitBundle;
|
||||
import crazypants.enderio.conduit.RaytraceResult;
|
||||
import crazypants.enderio.conduit.geom.CollidableComponent;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.ItemFilter;
|
||||
import crazypants.enderio.machine.RedstoneControlMode;
|
||||
import crazypants.enderio.machine.monitor.PacketConduitProbe;
|
||||
import crazypants.render.IconUtil;
|
||||
@@ -235,7 +237,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
inputFilters.put(dir, filter);
|
||||
if(network != null) {
|
||||
network.routesChanged();
|
||||
}
|
||||
}
|
||||
setClientStateDirty();
|
||||
}
|
||||
|
||||
@@ -601,14 +603,12 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
public void writeToNBT(NBTTagCompound nbtRoot) {
|
||||
super.writeToNBT(nbtRoot);
|
||||
|
||||
//nbtRoot.setShort("metaData", (short) metaData);
|
||||
|
||||
for (Entry<ForgeDirection, IItemFilter> entry : inputFilters.entrySet()) {
|
||||
if(entry.getValue() != null) {
|
||||
IItemFilter f = entry.getValue();
|
||||
if(!isDefault(f)) {
|
||||
NBTTagCompound itemRoot = new NBTTagCompound();
|
||||
f.writeToNBT(itemRoot);
|
||||
FilterRegister.writeFilterToNbt(f, itemRoot);
|
||||
nbtRoot.setTag("inFilts." + entry.getKey().name(), itemRoot);
|
||||
}
|
||||
}
|
||||
@@ -628,7 +628,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
IItemFilter f = entry.getValue();
|
||||
if(!isDefault(f)) {
|
||||
NBTTagCompound itemRoot = new NBTTagCompound();
|
||||
f.writeToNBT(itemRoot);
|
||||
FilterRegister.writeFilterToNbt(f, itemRoot);
|
||||
nbtRoot.setTag("outFilts." + entry.getKey().name(), itemRoot);
|
||||
}
|
||||
}
|
||||
@@ -728,12 +728,8 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
String key = "inFilts." + dir.name();
|
||||
if(nbtRoot.hasKey(key)) {
|
||||
NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
|
||||
ItemFilter filter = new ItemFilter(metaData == 1);
|
||||
if(metaData == 1) {
|
||||
//need to force this for upgrades from old version
|
||||
filterTag.setBoolean("isAdvanced", true);
|
||||
}
|
||||
filter.readFromNBT(filterTag);
|
||||
FilterRegister.updateLegacyFilterNbt(filterTag, metaData);
|
||||
IItemFilter filter = FilterRegister.loadFilterFromNbt(filterTag);
|
||||
inputFilters.put(dir, filter);
|
||||
}
|
||||
|
||||
@@ -761,12 +757,8 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
key = "outFilts." + dir.name();
|
||||
if(nbtRoot.hasKey(key)) {
|
||||
NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
|
||||
ItemFilter filter = new ItemFilter(metaData == 1);
|
||||
if(metaData == 1) {
|
||||
//need to force this for upgrades from old version
|
||||
filterTag.setBoolean("isAdvanced", true);
|
||||
}
|
||||
filter.readFromNBT(filterTag);
|
||||
FilterRegister.updateLegacyFilterNbt(filterTag, metaData);
|
||||
IItemFilter filter = FilterRegister.loadFilterFromNbt(filterTag);
|
||||
outputFilters.put(dir, filter);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ import crazypants.enderio.conduit.ConduitNetworkTickHandler;
|
||||
import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.item.NetworkedInventory.Target;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.util.BlockCoord;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
@@ -139,8 +140,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
|
||||
if(source != null && source.sendPriority != null) {
|
||||
for (Target t : source.sendPriority) {
|
||||
IItemFilter f = t.inv.con.getOutputFilter(t.inv.conDir);
|
||||
if(input == null || f == null || f.doesItemPassFilter(input)) {
|
||||
String s = Lang.localize(t.inv.inv.getInventoryName(), false) + " " + t.inv.location + " Distance [" + t.distance + "] ";
|
||||
if(input == null || f == null || f.doesItemPassFilter(t.inv, input)) {
|
||||
String s = Lang.localize(t.inv.getInventory().getInventoryName(), false) + " " + t.inv.location + " Distance [" + t.distance + "] ";
|
||||
result.add(s);
|
||||
}
|
||||
}
|
||||
@@ -156,8 +157,8 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
|
||||
for (NetworkedInventory inv : inventories) {
|
||||
if(inv.hasTarget(con, dir)) {
|
||||
IItemFilter f = inv.con.getInputFilter(inv.conDir);
|
||||
if(input == null || f == null || f.doesItemPassFilter(input)) {
|
||||
result.add(Lang.localize(inv.inv.getInventoryName(), false) + " " + inv.location);
|
||||
if(input == null || f == null || f.doesItemPassFilter(inv, input)) {
|
||||
result.add(Lang.localize(inv.getInventory().getInventoryName(), false) + " " + inv.location);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,13 +16,14 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.util.BlockCoord;
|
||||
import crazypants.util.InventoryWrapper;
|
||||
import crazypants.util.ItemUtil;
|
||||
|
||||
class NetworkedInventory {
|
||||
public class NetworkedInventory {
|
||||
|
||||
ISidedInventory inv;
|
||||
private ISidedInventory inv;
|
||||
IItemConduit con;
|
||||
ForgeDirection conDir;
|
||||
BlockCoord location;
|
||||
@@ -126,7 +127,7 @@ class NetworkedInventory {
|
||||
updateInventory();
|
||||
}
|
||||
|
||||
int[] slotIndices = inv.getAccessibleSlotsFromSide(inventorySide);
|
||||
int[] slotIndices = getInventory().getAccessibleSlotsFromSide(inventorySide);
|
||||
if(slotIndices == null) {
|
||||
return false;
|
||||
}
|
||||
@@ -139,10 +140,10 @@ class NetworkedInventory {
|
||||
for (int i = 0; i < slotChecksPerTick; i++) {
|
||||
int index = nextSlot(numSlots);
|
||||
slot = slotIndices[index];
|
||||
ItemStack item = inv.getStackInSlot(slot);
|
||||
ItemStack item = getInventory().getStackInSlot(slot);
|
||||
if(canExtractItem(item)) {
|
||||
extractItem = item.copy();
|
||||
if(inv.canExtractItem(slot, extractItem, inventorySide)) {
|
||||
if(getInventory().canExtractItem(slot, extractItem, inventorySide)) {
|
||||
if(doTransfer(extractItem, slot, maxExtracted)) {
|
||||
setNextStartingSlot(slot);
|
||||
return true;
|
||||
@@ -161,7 +162,7 @@ class NetworkedInventory {
|
||||
if(filter == null) {
|
||||
return true;
|
||||
}
|
||||
return filter.doesItemPassFilter(itemStack);
|
||||
return filter.doesItemPassFilter(this, itemStack);
|
||||
}
|
||||
|
||||
private boolean doTransfer(ItemStack extractedItem, int slot, int maxExtract) {
|
||||
@@ -175,16 +176,16 @@ class NetworkedInventory {
|
||||
return false;
|
||||
}
|
||||
|
||||
ItemStack curStack = inv.getStackInSlot(slot);
|
||||
ItemStack curStack = getInventory().getStackInSlot(slot);
|
||||
if(curStack != null) {
|
||||
curStack = curStack.copy();
|
||||
curStack.stackSize -= numInserted;
|
||||
if(curStack.stackSize > 0) {
|
||||
inv.setInventorySlotContents(slot, curStack);
|
||||
inv.markDirty();
|
||||
getInventory().setInventorySlotContents(slot, curStack);
|
||||
getInventory().markDirty();
|
||||
} else {
|
||||
inv.setInventorySlotContents(slot, null);
|
||||
inv.markDirty();
|
||||
getInventory().setInventorySlotContents(slot, null);
|
||||
getInventory().markDirty();
|
||||
}
|
||||
}
|
||||
con.itemsExtracted(numInserted, slot);
|
||||
@@ -208,7 +209,7 @@ class NetworkedInventory {
|
||||
for (Target target : targets) {
|
||||
if(target.stickyInput && !matchedStickyInput) {
|
||||
IItemFilter of = target.inv.con.getOutputFilter(target.inv.conDir);
|
||||
matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(toExtract);
|
||||
matchedStickyInput = of != null && of.isValid() && of.doesItemPassFilter(this, toExtract);
|
||||
}
|
||||
if(target.stickyInput || !matchedStickyInput) {
|
||||
if(target.inv.recheckInv) {
|
||||
@@ -238,7 +239,7 @@ class NetworkedInventory {
|
||||
|
||||
TileEntity te = world.getTileEntity(location.x, location.y, location.z);
|
||||
if(te instanceof ISidedInventory) {
|
||||
this.inv = (ISidedInventory) te;
|
||||
inv = (ISidedInventory) te;
|
||||
} else if(te instanceof IInventory) {
|
||||
inv = new InventoryWrapper((IInventory) te);
|
||||
}
|
||||
@@ -250,11 +251,11 @@ class NetworkedInventory {
|
||||
}
|
||||
IItemFilter filter = con.getOutputFilter(conDir);
|
||||
if(filter != null) {
|
||||
if(!filter.doesItemPassFilter(item)) {
|
||||
if(!filter.doesItemPassFilter(this, item)) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return ItemUtil.doInsertItem(inv, item, ForgeDirection.values()[inventorySide]);
|
||||
return ItemUtil.doInsertItem(getInventory(), item, ForgeDirection.values()[inventorySide]);
|
||||
}
|
||||
|
||||
void updateInsertOrder() {
|
||||
@@ -341,6 +342,20 @@ class NetworkedInventory {
|
||||
return con.getLocation().distanceSquared(other.con.getLocation());
|
||||
}
|
||||
|
||||
public ISidedInventory getInventory() {
|
||||
return inv;
|
||||
}
|
||||
|
||||
public int getInventorySide() {
|
||||
return inventorySide;
|
||||
}
|
||||
|
||||
public void setInventorySide(int inventorySide) {
|
||||
this.inventorySide = inventorySide;
|
||||
}
|
||||
|
||||
|
||||
|
||||
class RoundRobinIterable implements Iterable<Target>, Iterator<Target> {
|
||||
|
||||
int index = -1;
|
||||
|
||||
@@ -0,0 +1,129 @@
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import crazypants.enderio.conduit.item.NetworkedInventory;
|
||||
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class ExistingItemFilter implements IItemFilter {
|
||||
|
||||
boolean matchMeta = true;
|
||||
boolean useOreDict = false;
|
||||
boolean convertOreDict = false;
|
||||
boolean matchNBT = false;
|
||||
boolean sticky = false;
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbtRoot) {
|
||||
matchMeta = nbtRoot.getBoolean("matchMeta");
|
||||
matchNBT = nbtRoot.getBoolean("matchNBT");
|
||||
useOreDict = nbtRoot.getBoolean("useOreDict");
|
||||
sticky = nbtRoot.getBoolean("sticky");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbtRoot) {
|
||||
nbtRoot.setBoolean("matchMeta", matchMeta);
|
||||
nbtRoot.setBoolean("matchNBT", matchNBT);
|
||||
nbtRoot.setBoolean("useOreDict", useOreDict);
|
||||
nbtRoot.setBoolean("sticky", sticky);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doesItemPassFilter(NetworkedInventory ni, ItemStack item) {
|
||||
if(item == null) {
|
||||
return false;
|
||||
}
|
||||
int[] slots = ni.getInventory().getAccessibleSlotsFromSide(ni.getInventorySide());
|
||||
for(int i=0;i<slots.length;i++) {
|
||||
ItemStack stack = ni.getInventory().getStackInSlot(i);
|
||||
if(stackEqual(item, stack)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean stackEqual(ItemStack toInsert, ItemStack existing) {
|
||||
if(toInsert == null || existing == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean matched = false;
|
||||
if(useOreDict) {
|
||||
int existingId = OreDictionary.getOreID(existing);
|
||||
matched = existingId != -1 && existingId == OreDictionary.getOreID(toInsert);
|
||||
}
|
||||
if(!matched) {
|
||||
matched = Item.getIdFromItem(toInsert.getItem()) == Item.getIdFromItem(existing.getItem());
|
||||
if(matched && matchMeta) {
|
||||
matched = toInsert.getItemDamage() == existing.getItemDamage();
|
||||
}
|
||||
if(matched && matchNBT) {
|
||||
matched = ItemStack.areItemStackTagsEqual(toInsert, existing);
|
||||
}
|
||||
}
|
||||
return matched;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) {
|
||||
return sticky && doesItemPassFilter(inv, item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isValid() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Slot> getSlots() {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSlotCount() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
public boolean isMatchMeta() {
|
||||
return matchMeta;
|
||||
}
|
||||
|
||||
public void setMatchMeta(boolean matchMeta) {
|
||||
this.matchMeta = matchMeta;
|
||||
}
|
||||
|
||||
public boolean isMatchNBT() {
|
||||
return matchNBT;
|
||||
}
|
||||
|
||||
public void setMatchNBT(boolean matchNbt) {
|
||||
this.matchNBT = matchNbt;
|
||||
}
|
||||
|
||||
public boolean isUseOreDict() {
|
||||
return useOreDict;
|
||||
}
|
||||
|
||||
public void setUseOreDict(boolean useOreDict) {
|
||||
this.useOreDict = useOreDict;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSticky() {
|
||||
return sticky;
|
||||
}
|
||||
|
||||
public void setSticky(boolean sticky) {
|
||||
this.sticky = sticky;
|
||||
}
|
||||
|
||||
}
|
||||
+5
-3
@@ -1,7 +1,9 @@
|
||||
package crazypants.enderio.conduit.item;
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import crazypants.enderio.conduit.item.NetworkedInventory;
|
||||
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -12,9 +14,9 @@ public interface IItemFilter {
|
||||
|
||||
void writeToNBT(NBTTagCompound nbtRoot);
|
||||
|
||||
boolean doesItemPassFilter(ItemStack item);
|
||||
boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item);
|
||||
|
||||
boolean doesFilterCaptureStack(ItemStack item);
|
||||
boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item);
|
||||
|
||||
boolean isValid();
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package crazypants.enderio.conduit.item;
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
+5
-2
@@ -1,4 +1,4 @@
|
||||
package crazypants.enderio.conduit.item;
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.conduit.item.FilterRegister;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
|
||||
@@ -50,7 +51,9 @@ public class ItemBasicItemFilter extends Item implements IItemFilterUpgrade {
|
||||
} else {
|
||||
filter = new ItemFilter(true);
|
||||
}
|
||||
FilterRegister.loadFilterFromStack(filter, stack);
|
||||
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
|
||||
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.gui.IResourceTooltipProvider;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, IResourceTooltipProvider {
|
||||
|
||||
public static ItemExistingItemFilter create() {
|
||||
ItemExistingItemFilter result = new ItemExistingItemFilter();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
|
||||
protected ItemExistingItemFilter() {
|
||||
setCreativeTab(EnderIOTab.tabEnderIO);
|
||||
setUnlocalizedName(ModObject.itemExistingItemFilter.unlocalisedName);
|
||||
setHasSubtypes(true);
|
||||
setMaxDamage(0);
|
||||
setMaxStackSize(64);
|
||||
}
|
||||
|
||||
protected void init() {
|
||||
GameRegistry.registerItem(this, ModObject.itemExistingItemFilter.unlocalisedName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IItemFilter createFilterFromStack(ItemStack stack) {
|
||||
IItemFilter filter = new ExistingItemFilter();
|
||||
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
|
||||
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister IIconRegister) {
|
||||
itemIcon = IIconRegister.registerIcon("enderio:existingItemFilter");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUnlocalizedNameForTooltip(ItemStack stack) {
|
||||
return getUnlocalizedName();
|
||||
}
|
||||
|
||||
}
|
||||
+7
-5
@@ -1,4 +1,4 @@
|
||||
package crazypants.enderio.conduit.item;
|
||||
package crazypants.enderio.conduit.item.filter;
|
||||
|
||||
import java.awt.Point;
|
||||
import java.util.ArrayList;
|
||||
@@ -7,11 +7,13 @@ import java.util.List;
|
||||
|
||||
import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction;
|
||||
|
||||
import crazypants.enderio.conduit.item.NetworkedInventory;
|
||||
import crazypants.gui.TemplateSlot;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTBase;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -57,12 +59,12 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doesFilterCaptureStack(ItemStack item) {
|
||||
public boolean doesFilterCaptureStack(NetworkedInventory inv, ItemStack item) {
|
||||
return isSticky() && itemMatched(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doesItemPassFilter(ItemStack item) {
|
||||
public boolean doesItemPassFilter(NetworkedInventory inv, ItemStack item) {
|
||||
if(!isValid()) {
|
||||
return true;
|
||||
}
|
||||
@@ -84,7 +86,7 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
matched = true;
|
||||
}
|
||||
}
|
||||
if(!matched && it != null && item.getItem() == it.getItem()) {
|
||||
if(!matched && it != null && Item.getIdFromItem(item.getItem()) == Item.getIdFromItem(it.getItem())) {
|
||||
matched = true;
|
||||
if(matchMeta && item.getItemDamage() != it.getItemDamage()) {
|
||||
matched = false;
|
||||
@@ -326,7 +328,7 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
public String toString() {
|
||||
// return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + ", useOreDict=" + useOreDict + ", sticky="
|
||||
// + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]";
|
||||
return "ItemFilter [isAdvanced=" + isAdvanced + "]";
|
||||
return "ItemFilter [isAdvanced=" + isAdvanced + ", items=" + Arrays.toString(items) + "]";
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.conduit.item.FilterRegister;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.filter.IItemFilter;
|
||||
import crazypants.util.DyeColor;
|
||||
|
||||
public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit> implements IMessageHandler<PacketItemConduitFilter, IMessage> {
|
||||
|
||||
Reference in new issue
Block a user