From b72740cffd2185fb2f482bf263c0cb771386f995 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 24 Apr 2017 10:44:31 -0400 Subject: [PATCH] Add comprehensive computer integration to Logistical Sorter --- src/main/java/mekanism/api/EnumColor.java | 13 ++ .../common/tile/TileEntityDigitalMiner.java | 10 ++ .../tile/TileEntityLogisticalSorter.java | 161 +++++++++++++++++- 3 files changed, 182 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/api/EnumColor.java b/src/main/java/mekanism/api/EnumColor.java index f878c6d55..102189027 100644 --- a/src/main/java/mekanism/api/EnumColor.java +++ b/src/main/java/mekanism/api/EnumColor.java @@ -116,4 +116,17 @@ public enum EnumColor implements IStringSerializable { return code; } + + public static EnumColor getFromDyeName(String s) + { + for(EnumColor c : values()) + { + if(c.dyeName.equalsIgnoreCase(s)) + { + return c; + } + } + + return null; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 8f4ca3b14..8ce91ddd5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1326,6 +1326,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } filters.add(new MItemStackFilter(new ItemStack(Item.getItemById(num), 1, meta))); + + return new Object[] {"Added filter."}; } else if(method == 4) { @@ -1340,9 +1342,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(MekanismUtils.getID(((MItemStackFilter)filter).itemType) == num) { iter.remove(); + return new Object[] {"Removed filter."}; } } } + + return new Object[] {"Couldn't find filter."}; } else if(method == 5) { @@ -1351,6 +1356,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I filter.oreDictName = ore; filters.add(filter); + + return new Object[] {"Added filter."}; } else if(method == 6) { @@ -1366,9 +1373,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(((MOreDictFilter)filter).oreDictName.equals(ore)) { iter.remove(); + return new Object[] {"Removed filter."}; } } } + + return new Object[] {"Couldn't find filter."}; } else if(method == 7) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index b9dbbf9ab..082970348 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; +import java.util.Iterator; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -23,8 +24,10 @@ import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.StackSearcher; import mekanism.common.content.transporter.TItemStackFilter; +import mekanism.common.content.transporter.TOreDictFilter; 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; import mekanism.common.tile.component.TileComponentSecurity; @@ -32,10 +35,11 @@ import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -47,7 +51,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile +public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile, IComputerIntegration { public HashList filters = new HashList(); @@ -702,6 +706,159 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } } + public String[] methods = {"setDefaultColor", "setRoundRobin", "setAutoEject", "addFilter", "removeFilter", "addOreFilter", "removeOreFilter"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] arguments) throws Exception + { + if(arguments.length > 0) + { + if(method == 0) + { + if(!(arguments[0] instanceof String)) + { + return new Object[] {"Invalid parameters."}; + } + + color = EnumColor.getFromDyeName((String)arguments[0]); + + if(color == null) + { + return new Object[] {"Default color set to null"}; + } + else { + return new Object[] {"Default color set to " + color.dyeName}; + } + } + else if(method == 1) + { + if(!(arguments[0] instanceof Boolean)) + { + return new Object[] {"Invalid parameters."}; + } + + roundRobin = (Boolean)arguments[0]; + + return new Object[] {"Round-robin mode set to " + roundRobin}; + } + else if(method == 2) + { + if(!(arguments[0] instanceof Boolean)) + { + return new Object[] {"Invalid parameters."}; + } + + autoEject = (Boolean)arguments[0]; + + return new Object[] {"Auto-eject mode set to " + autoEject}; + } + else if(method == 3) + { + if(arguments.length != 6 || !(arguments[0] instanceof String) || !(arguments[1] instanceof Integer) || + !(arguments[2] instanceof String) || !(arguments[3] instanceof Boolean) || + !(arguments[4] instanceof Integer) || !(arguments[5] instanceof Integer)) + { + return new Object[] {"Invalid parameters."}; + } + + TItemStackFilter filter = new TItemStackFilter(); + filter.itemType = new ItemStack(Item.getByNameOrId((String)arguments[0]), 1, (Integer)arguments[1]); + + if(filter.itemType.getItem() == null) + { + return new Object[] {"Invalid item type."}; + } + + filter.color = EnumColor.getFromDyeName((String)arguments[2]); + filter.sizeMode = (Boolean)arguments[3]; + filter.min = (Integer)arguments[4]; + filter.max = (Integer)arguments[5]; + filters.add(filter); + + return new Object[] {"Added filter."}; + } + else if(method == 4) + { + if(arguments.length != 2 || !(arguments[0] instanceof String) || !(arguments[1] instanceof Integer)) + { + return new Object[] {"Invalid parameters."}; + } + + ItemStack stack = new ItemStack(Item.getByNameOrId((String)arguments[0]), 1, (Integer)arguments[1]); + Iterator iter = filters.iterator(); + + while(iter.hasNext()) + { + TransporterFilter filter = iter.next(); + + if(filter instanceof TItemStackFilter) + { + if(StackUtils.equalsWildcard(((TItemStackFilter)filter).itemType, stack)) + { + iter.remove(); + return new Object[] {"Removed filter."}; + } + } + } + + return new Object[] {"Couldn't find filter."}; + } + else if(method == 5) + { + if(arguments.length != 2 || !(arguments[0] instanceof String) | !(arguments[1] instanceof String)) + { + return new Object[] {"Invalid parameters."}; + } + + TOreDictFilter filter = new TOreDictFilter(); + filter.oreDictName = (String)arguments[0]; + filter.color = EnumColor.getFromDyeName((String)arguments[1]); + filters.add(filter); + + return new Object[] {"Added filter."}; + } + else if(method == 6) + { + if(arguments.length != 1 || !(arguments[0] instanceof String)) + { + return new Object[] {"Invalid parameters."}; + } + + String ore = (String)arguments[0]; + Iterator iter = filters.iterator(); + + while(iter.hasNext()) + { + TransporterFilter filter = iter.next(); + + if(filter instanceof TOreDictFilter) + { + if(((TOreDictFilter)filter).oreDictName.equals(ore)) + { + iter.remove(); + return new Object[] {"Removed filter."}; + } + } + } + + return new Object[] {"Couldn't find filter."}; + } + } + + for(EntityPlayer player : playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList())), (EntityPlayerMP)player); + } + + return null; + } + @Override public boolean hasCapability(Capability capability, EnumFacing side) {