From 8d66d4b9738cf2cd540bab119210a32b2238eab3 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 28 Apr 2017 16:43:00 -0400 Subject: [PATCH] Added "Allow Default" option to transporter filters to allow prevention of default route --- .../client/gui/GuiTItemStackFilter.java | 29 ++++- .../client/gui/GuiTMaterialFilter.java | 24 +++- .../mekanism/client/gui/GuiTModIDFilter.java | 28 ++++- .../client/gui/GuiTOreDictFilter.java | 28 ++++- .../client/gui/element/GuiElement.java | 1 - .../java/mekanism/common/PacketHandler.java | 2 +- .../content/transporter/TItemStackFilter.java | 12 +- .../content/transporter/TMaterialFilter.java | 4 +- .../content/transporter/TModIDFilter.java | 3 +- .../content/transporter/TOreDictFilter.java | 3 +- .../content/transporter/TransitRequest.java | 14 ++- .../transporter/TransporterFilter.java | 12 +- .../transporter/TransporterPathfinder.java | 22 ++-- .../tile/TileEntityLogisticalSorter.java | 43 ++++--- .../common/tile/TileEntityMultiblock.java | 5 +- .../common/transmitters/TransporterImpl.java | 2 +- .../mekanism/common/util/InventoryUtils.java | 115 ------------------ .../mekanism/gui/guititemstackfilter.png | Bin 19440 -> 5824 bytes .../mekanism/gui/guitmaterialfilter.png | Bin 19280 -> 5954 bytes .../assets/mekanism/gui/guitmodidfilter.png | Bin 19597 -> 6149 bytes .../assets/mekanism/gui/guitoredictfilter.png | Bin 19753 -> 6149 bytes .../resources/assets/mekanism/lang/en_us.lang | 2 + 22 files changed, 176 insertions(+), 173 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index c844423e8..c4f680418 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -77,8 +77,8 @@ public class GuiTItemStackFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 47, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 109, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -178,6 +178,7 @@ public class GuiTItemStackFilter extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.min") + ":", 128, 20, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.itemFilter.max") + ":", 128, 32, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui." + (filter.sizeMode ? "on" : "off")), 141, 46, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040); if(!filter.itemType.isEmpty()) { @@ -202,6 +203,16 @@ public class GuiTItemStackFilter extends GuiMekanism GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); } + + if(xAxis >= 128 && xAxis <= 139 && yAxis >= 44 && yAxis <= 55) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.sizeMode"), xAxis, yAxis); + } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis); + } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { @@ -261,6 +272,14 @@ public class GuiTItemStackFilter extends GuiMekanism else { drawTexturedModalRect(guiWidth + 128, guiHeight + 44, 187, 11, 11, 11); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 198, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 198, 11, 11, 11); + } minField.drawTextBox(); maxField.drawTextBox(); @@ -326,6 +345,12 @@ public class GuiTItemStackFilter extends GuiMekanism SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); filter.sizeMode = !filter.sizeMode; } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); + filter.allowDefault = !filter.allowDefault; + } } if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && button == 0) diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 4dc9e301f..1e533c82a 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -76,8 +76,8 @@ public class GuiTMaterialFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 47, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 109, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -126,6 +126,7 @@ public class GuiTMaterialFilter extends GuiMekanism fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.materialFilter"), 43, 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.materialFilter.details") + ":", 35, 32, 0x00CD00); + fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040); if(!filter.materialItem.isEmpty()) { @@ -151,6 +152,11 @@ public class GuiTMaterialFilter extends GuiMekanism GlStateManager.popMatrix(); } + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis); + } + if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { if(filter.color != null) @@ -198,6 +204,14 @@ public class GuiTMaterialFilter extends GuiMekanism else { drawTexturedModalRect(guiWidth + 5, guiHeight + 5, 176, 11, 11, 11); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 198, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 198, 11, 11, 11); + } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { @@ -257,6 +271,12 @@ public class GuiTMaterialFilter extends GuiMekanism SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); + filter.allowDefault = !filter.allowDefault; + } } if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && button == 0) diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 44375e4b2..387ec6271 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -89,8 +89,8 @@ public class GuiTModIDFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 47, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 109, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -167,8 +167,9 @@ public class GuiTModIDFilter extends GuiMekanism fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.modIDFilter"), 43, 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); renderScaledText(LangUtils.localize("gui.id") + ": " + filter.modID, 35, 32, 0x00CD00, 107); + fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040); - if(renderStack != null) + if(!renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); @@ -192,6 +193,11 @@ public class GuiTModIDFilter extends GuiMekanism GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis); + } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { @@ -234,6 +240,14 @@ public class GuiTModIDFilter extends GuiMekanism else { drawTexturedModalRect(guiWidth + 131, guiHeight + 47, 176 + 11, 12, 12, 12); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 199, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 199, 11, 11, 11); + } modIDText.drawTextBox(); @@ -277,7 +291,7 @@ public class GuiTModIDFilter extends GuiMekanism } else if(iterStacks != null && iterStacks.size() == 0) { - renderStack = null; + renderStack = ItemStack.EMPTY; } } @@ -304,6 +318,12 @@ public class GuiTModIDFilter extends GuiMekanism SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setModID(); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); + filter.allowDefault = !filter.allowDefault; + } } if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && button == 0) diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index 848f29096..1cf9d2f7a 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -89,8 +89,8 @@ public class GuiTOreDictFilter extends GuiMekanism int guiHeight = (height - ySize) / 2; buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 27, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); - buttonList.add(new GuiButton(1, guiWidth + 89, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); + buttonList.add(new GuiButton(0, guiWidth + 47, guiHeight + 62, 60, 20, LangUtils.localize("gui.save"))); + buttonList.add(new GuiButton(1, guiWidth + 109, guiHeight + 62, 60, 20, LangUtils.localize("gui.delete"))); if(isNew) { @@ -167,8 +167,9 @@ public class GuiTOreDictFilter extends GuiMekanism fontRendererObj.drawString((isNew ? LangUtils.localize("gui.new") : LangUtils.localize("gui.edit")) + " " + LangUtils.localize("gui.oredictFilter"), 43, 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.status") + ": " + status, 35, 20, 0x00CD00); renderScaledText(LangUtils.localize("gui.key") + ": " + filter.oreDictName, 35, 32, 0x00CD00, 107); + fontRendererObj.drawString(LangUtils.localize("gui." + (filter.allowDefault ? "on" : "off")), 24, 66, 0x404040); - if(renderStack != null) + if(!renderStack.isEmpty()) { try { GlStateManager.pushMatrix(); @@ -192,6 +193,11 @@ public class GuiTOreDictFilter extends GuiMekanism GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.allowDefault"), xAxis, yAxis); + } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) { @@ -234,6 +240,14 @@ public class GuiTOreDictFilter extends GuiMekanism else { drawTexturedModalRect(guiWidth + 131, guiHeight + 47, 176 + 11, 12, 12, 12); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 199, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 11, guiHeight + 64, 199, 11, 11, 11); + } oreDictText.drawTextBox(); @@ -277,7 +291,7 @@ public class GuiTOreDictFilter extends GuiMekanism } else if(iterStacks != null && iterStacks.size() == 0) { - renderStack = null; + renderStack = ItemStack.EMPTY; } } @@ -304,6 +318,12 @@ public class GuiTOreDictFilter extends GuiMekanism SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); setOreDictKey(); } + + if(xAxis >= 11 && xAxis <= 22 && yAxis >= 64 && yAxis <= 75) + { + SoundHandler.playSound(SoundEvents.UI_BUTTON_CLICK); + filter.allowDefault = !filter.allowDefault; + } } if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && button == 0) diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 0c2450c9b..2ff52b160 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -74,7 +74,6 @@ public abstract class GuiElement { try { int left = (Integer)ReflectionUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); - System.out.println(left + " " + guiLeft); ReflectionUtils.setPrivateValue(guiObj, left + guiLeft, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); } catch(Exception e) { e.printStackTrace(); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 3d4ce2303..11453ba18 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -256,7 +256,7 @@ public class PacketHandler { if(general.logPackets) { - System.out.println("[Mekanism] " + log); + Mekanism.logger.info(log); } } diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index f4097593f..6ff03ecdc 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -21,19 +21,22 @@ public class TItemStackFilter extends TransporterFilter public ItemStack itemType = ItemStack.EMPTY; @Override - public boolean canFilter(ItemStack itemStack) + public boolean canFilter(ItemStack itemStack, boolean strict) { if(itemStack.isEmpty()) { return false; } - if(sizeMode && max == 0) + if(strict && sizeMode) { - return false; + if(max == 0 || itemStack.getCount() < min) + { + return false; + } } - return (itemType.getHasSubtypes() ? itemType.isItemEqual(itemStack) : itemType.getItem() == itemStack.getItem()) && (!sizeMode || itemStack.getCount() >= min); + return (itemType.getHasSubtypes() ? itemType.isItemEqual(itemStack) : itemType.getItem() == itemStack.getItem()); } @Override @@ -130,6 +133,7 @@ public class TItemStackFilter extends TransporterFilter public TItemStackFilter clone() { TItemStackFilter filter = new TItemStackFilter(); + filter.allowDefault = allowDefault; filter.color = color; filter.itemType = itemType.copy(); filter.sizeMode = sizeMode; diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 288a7cef9..c581023d8 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -24,7 +24,7 @@ public class TMaterialFilter extends TransporterFilter } @Override - public boolean canFilter(ItemStack itemStack) + public boolean canFilter(ItemStack itemStack, boolean strict) { if(itemStack.isEmpty() || !(itemStack.getItem() instanceof ItemBlock)) { @@ -97,6 +97,8 @@ public class TMaterialFilter extends TransporterFilter public TMaterialFilter clone() { TMaterialFilter filter = new TMaterialFilter(); + filter.allowDefault = allowDefault; + filter.color = color; filter.materialItem = materialItem; return filter; diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index 1b1479d97..1c8e23e55 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -14,7 +14,7 @@ public class TModIDFilter extends TransporterFilter public String modID; @Override - public boolean canFilter(ItemStack itemStack) + public boolean canFilter(ItemStack itemStack, boolean strict) { if(itemStack.isEmpty()) { @@ -84,6 +84,7 @@ public class TModIDFilter extends TransporterFilter public TModIDFilter clone() { TModIDFilter filter = new TModIDFilter(); + filter.allowDefault = allowDefault; filter.color = color; filter.modID = modID; diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index a351d20ef..59a3272fe 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -14,7 +14,7 @@ public class TOreDictFilter extends TransporterFilter public String oreDictName; @Override - public boolean canFilter(ItemStack itemStack) + public boolean canFilter(ItemStack itemStack, boolean strict) { if(itemStack.isEmpty()) { @@ -84,6 +84,7 @@ public class TOreDictFilter extends TransporterFilter public TOreDictFilter clone() { TOreDictFilter filter = new TOreDictFilter(); + filter.allowDefault = allowDefault; filter.color = color; filter.oreDictName = oreDictName; diff --git a/src/main/java/mekanism/common/content/transporter/TransitRequest.java b/src/main/java/mekanism/common/content/transporter/TransitRequest.java index 41e118d7d..c1912c883 100644 --- a/src/main/java/mekanism/common/content/transporter/TransitRequest.java +++ b/src/main/java/mekanism/common/content/transporter/TransitRequest.java @@ -3,6 +3,7 @@ package mekanism.common.content.transporter; import java.util.HashMap; import java.util.Map; +import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.util.InventoryUtils; import mekanism.common.util.StackUtils; import net.minecraft.inventory.IInventory; @@ -57,6 +58,11 @@ public class TransitRequest } public static TransitRequest getTopStacks(TileEntity tile, EnumFacing side, int amount) + { + return getTopStacks(tile, side, amount, new FirstFinder()); + } + + public static TransitRequest getTopStacks(TileEntity tile, EnumFacing side, int amount, Finder finder) { TransitRequest ret = new TransitRequest(); @@ -68,7 +74,7 @@ public class TransitRequest { ItemStack stack = inventory.extractItem(i, amount, true); - if(!stack.isEmpty() && !ret.hasType(stack)) + if(!stack.isEmpty() && !ret.hasType(stack) && finder.modifies(stack)) { ret.setItem(stack, i); } @@ -90,7 +96,7 @@ public class TransitRequest ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy(); toSend.setCount(Math.min(amount, toSend.getCount())); - if(!ret.hasType(toSend) && sidedInventory.canExtractItem(slotID, toSend, side.getOpposite())) + if(!ret.hasType(toSend) && sidedInventory.canExtractItem(slotID, toSend, side.getOpposite()) && finder.modifies(toSend)) { ret.setItem(toSend, slotID); } @@ -109,7 +115,7 @@ public class TransitRequest ItemStack toSend = inventory.getStackInSlot(i).copy(); toSend.setCount(Math.min(amount, toSend.getCount())); - if(!ret.hasType(toSend)) + if(!ret.hasType(toSend) && finder.modifies(toSend)) { ret.setItem(toSend, i); } @@ -135,7 +141,7 @@ public class TransitRequest public boolean isEmpty() { - return slotID == -1 || stack.isEmpty(); + return stack.isEmpty(); } public ItemStack getRejected(ItemStack orig) diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 8450f3f92..c30eb9405 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -18,8 +18,10 @@ public abstract class TransporterFilter public static final List SPECIAL_CHARS = Arrays.asList('*', '-', ' ', '|', '_', '\''); public EnumColor color; + + public boolean allowDefault; - public abstract boolean canFilter(ItemStack itemStack); + public abstract boolean canFilter(ItemStack itemStack, boolean strict); public abstract Finder getFinder(); @@ -30,6 +32,8 @@ public abstract class TransporterFilter public void write(NBTTagCompound nbtTags) { + nbtTags.setBoolean("allowDefault", allowDefault); + if(color != null) { nbtTags.setInteger("color", TransporterUtils.colors.indexOf(color)); @@ -38,6 +42,8 @@ public abstract class TransporterFilter protected void read(NBTTagCompound nbtTags) { + allowDefault = nbtTags.getBoolean("allowDefault"); + if(nbtTags.hasKey("color")) { color = TransporterUtils.colors.get(nbtTags.getInteger("color")); @@ -46,6 +52,8 @@ public abstract class TransporterFilter public void write(ArrayList data) { + data.add(allowDefault); + if(color != null) { data.add(TransporterUtils.colors.indexOf(color)); @@ -57,6 +65,8 @@ public abstract class TransporterFilter protected void read(ByteBuf dataStream) { + allowDefault = dataStream.readBoolean(); + int c = dataStream.readInt(); if(c != -1) diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index dc9029c81..9cd40e355 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -291,18 +291,18 @@ public final class TransporterPathfinder public static Destination getPath(DestChecker checker, EnumSet sides, ILogisticalTransporter start, Coord4D dest, TransporterStack stack, TransitResponse response, int min) { - List test = PathfinderCache.getCache(start.coord(), dest, sides); - - if(test != null && checkPath(start.world(), test, stack)) + if(response.stack.getCount() >= min) { - return new Destination(test, false, response, 0).calculateScore(start.world()); - } - - Pathfinder p = new Pathfinder(checker, start.world(), dest, start.coord(), stack); - - if(p.getPath().size() >= 2) - { - if(response.stack.getCount() >= min) + List test = PathfinderCache.getCache(start.coord(), dest, sides); + + if(test != null && checkPath(start.world(), test, stack)) + { + return new Destination(test, false, response, 0).calculateScore(start.world()); + } + + Pathfinder p = new Pathfinder(checker, start.world(), dest, start.coord(), stack); + + if(p.getPath().size() >= 2) { PathfinderCache.cachedPaths.put(new PathData(start.coord(), dest, p.side), p.getPath()); diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 58341387f..421b39796 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -20,7 +20,7 @@ import mekanism.common.base.ISustainedData; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.client; -import mekanism.common.content.transporter.Finder.FirstFinder; +import mekanism.common.content.transporter.Finder; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.StackSearcher; import mekanism.common.content.transporter.TItemStackFilter; @@ -28,7 +28,6 @@ import mekanism.common.content.transporter.TOreDictFilter; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterFilter; -import mekanism.common.content.transporter.TransporterManager; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; @@ -122,7 +121,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen break inner; } - if(filter.canFilter(invStack.getStack())) + if(filter.canFilter(invStack.getStack(), true)) { if(filter instanceof TItemStackFilter) { @@ -133,10 +132,10 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen min = itemFilter.min; } } - + TransitRequest request = TransitRequest.getFromStack(invStack.getStack()); TransitResponse response = emitItemToTransporter(front, request, filter.color, min); - + if(!response.isEmpty()) { invStack.use(response.stack.getCount()); @@ -152,19 +151,14 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen if(!sentItems && autoEject) { - InvStack invStack = InventoryUtils.takeTopStack(back, facing.getOpposite(), new FirstFinder()); + TransitRequest request = TransitRequest.getTopStacks(back, facing.getOpposite(), 64, new StrictFilterFinder()); + TransitResponse response = emitItemToTransporter(front, request, color, 0); - if(invStack != null && !invStack.getStack().isEmpty()) + if(!response.isEmpty()) { - TransitRequest request = TransitRequest.getTopStacks(back, facing.getOpposite(), 64); - TransitResponse response = emitItemToTransporter(front, request, color, 0); - - if(!response.isEmpty()) - { - response.getInvStack(back, facing).use(response.stack.getCount()); - back.markDirty(); - setActive(true); - } + response.getInvStack(back, facing).use(response.stack.getCount()); + back.markDirty(); + setActive(true); } } @@ -859,4 +853,21 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen return super.getCapability(capability, side); } + + private class StrictFilterFinder extends Finder + { + @Override + public boolean modifies(ItemStack stack) + { + for(TransporterFilter filter : filters) + { + if(filter.canFilter(stack, false) && !filter.allowDefault) + { + return false; + } + } + + return true; + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 60fe361e3..f6aa6186d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -81,14 +81,12 @@ public abstract class TileEntityMultiblock> extend { for(EntityPlayer player : playersUsing) { - System.out.println(world.isRemote + " " + clientHasStructure + " " + structure); - //player.closeScreen(); + player.closeScreen(); } } if(!world.isRemote) { - //System.out.println(pos + " " + structure); if(structure == null) { isRendering = false; @@ -131,7 +129,6 @@ public abstract class TileEntityMultiblock> extend if(structure != null) { - //System.out.println("Whee " + structure + " " + isInvalid()); getSynchronizedData().didTick = false; if(getSynchronizedData().inventoryID != null) diff --git a/src/main/java/mekanism/common/transmitters/TransporterImpl.java b/src/main/java/mekanism/common/transmitters/TransporterImpl.java index f97e53d57..054b6e63b 100644 --- a/src/main/java/mekanism/common/transmitters/TransporterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransporterImpl.java @@ -279,7 +279,7 @@ public class TransporterImpl extends TransmitterImpl= 0; i--) - { - ItemStack stack = inventory.extractItem(i, amount, true); - - if(!stack.isEmpty()) - { - return new InvStack(tile, i, stack, side.getOpposite()); - } - } - } - else if(tile instanceof ISidedInventory) - { - ISidedInventory sidedInventory = (ISidedInventory)tile; - int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - - if(slots != null) - { - for(int get = slots.length - 1; get >= 0; get--) - { - int slotID = slots[get]; - - if(!sidedInventory.getStackInSlot(slotID).isEmpty() && sidedInventory.getStackInSlot(slotID).getCount() > 0) - { - ItemStack toSend = sidedInventory.getStackInSlot(slotID).copy(); - toSend.setCount(Math.min(amount, toSend.getCount())); - - if(sidedInventory.canExtractItem(slotID, toSend, side.getOpposite())) - { - return new InvStack(tile, slotID, toSend, side.getOpposite()); - } - } - } - } - } - else if(tile instanceof IInventory) - { - IInventory inventory = checkChestInv((IInventory)tile); - - for(int i = inventory.getSizeInventory() - 1; i >= 0; i--) - { - if(!inventory.getStackInSlot(i).isEmpty() && inventory.getStackInSlot(i).getCount() > 0) - { - ItemStack toSend = inventory.getStackInSlot(i).copy(); - toSend.setCount(Math.min(amount, toSend.getCount())); - - return new InvStack(tile, i, toSend, side.getOpposite()); - } - } - } - - return null; - } - public static InvStack takeDefinedItem(TileEntity tile, EnumFacing side, ItemStack type, int min, int max) { InvStack ret = new InvStack(tile, side.getOpposite()); @@ -442,62 +383,6 @@ public final class InventoryUtils return null; } - public static InvStack takeTopStack(TileEntity tile, EnumFacing side, Finder id) - { - if(isItemHandler(tile, side.getOpposite())) - { - IItemHandler inventory = getItemHandler(tile, side.getOpposite()); - - for(int i = inventory.getSlots() - 1; i >= 0; i--) - { - ItemStack stack = inventory.extractItem(i, 64, true); - - if(!stack.isEmpty() && id.modifies(stack)) - { - return new InvStack(tile, i, stack, side.getOpposite()); - } - } - } - else if(tile instanceof ISidedInventory) - { - ISidedInventory sidedInventory = (ISidedInventory)tile; - int[] slots = sidedInventory.getSlotsForFace(side.getOpposite()); - - if(slots != null && slots.length != 0) - { - for(int get = slots.length - 1; get >= 0; get--) - { - int slotID = slots[get]; - - if(!sidedInventory.getStackInSlot(slotID).isEmpty() && id.modifies(sidedInventory.getStackInSlot(slotID))) - { - ItemStack toSend = sidedInventory.getStackInSlot(slotID); - - if(sidedInventory.canExtractItem(slotID, toSend, side.getOpposite())) - { - return new InvStack(tile, slotID, toSend, side.getOpposite()); - } - } - } - } - } - else if(tile instanceof IInventory) - { - IInventory inventory = checkChestInv((IInventory)tile); - - for(int i = inventory.getSizeInventory() - 1; i >= 0; i--) - { - if(!inventory.getStackInSlot(i).isEmpty() && id.modifies(inventory.getStackInSlot(i))) - { - ItemStack toSend = inventory.getStackInSlot(i).copy(); - return new InvStack(tile, i, toSend, side.getOpposite()); - } - } - } - - return null; - } - public static boolean canInsert(TileEntity tileEntity, EnumColor color, ItemStack itemStack, EnumFacing side, boolean force) { if(force && tileEntity instanceof TileEntityLogisticalSorter) diff --git a/src/main/resources/assets/mekanism/gui/guititemstackfilter.png b/src/main/resources/assets/mekanism/gui/guititemstackfilter.png index a5b02a0b214cbc4ab2110ead65716106ec5d4109..99fe7c7ac2fff0d7977184a7c1f97f27d9336daa 100644 GIT binary patch literal 5824 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 literal 19440 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 literal 19280 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 diff --git a/src/main/resources/assets/mekanism/gui/guitoredictfilter.png b/src/main/resources/assets/mekanism/gui/guitoredictfilter.png index 9e047b30ad561d00013753a31b2ab6a9fd06d83d..c467edd433d7e5c80dffd611fbe53063b8f46157 100644 GIT binary patch literal 6149 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