Split CPU Records.
This commit is contained in:
@@ -39,7 +39,6 @@ import appeng.helpers.WirelessTerminalGuiObject;
|
|||||||
import appeng.parts.reporting.PartCraftingTerminal;
|
import appeng.parts.reporting.PartCraftingTerminal;
|
||||||
import appeng.parts.reporting.PartPatternTerminal;
|
import appeng.parts.reporting.PartPatternTerminal;
|
||||||
import appeng.parts.reporting.PartTerminal;
|
import appeng.parts.reporting.PartTerminal;
|
||||||
import appeng.util.ItemSorters;
|
|
||||||
import appeng.util.Platform;
|
import appeng.util.Platform;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
@@ -77,35 +76,6 @@ public class ContainerCraftConfirm extends AEBaseContainer
|
|||||||
|
|
||||||
protected long cpuIdx = Long.MIN_VALUE;
|
protected long cpuIdx = Long.MIN_VALUE;
|
||||||
|
|
||||||
public class CraftingCPURecord implements Comparable<CraftingCPURecord>
|
|
||||||
{
|
|
||||||
|
|
||||||
ICraftingCPU cpu;
|
|
||||||
|
|
||||||
long id = cpuIdx++;
|
|
||||||
long size;
|
|
||||||
int processors;
|
|
||||||
|
|
||||||
public String myName;
|
|
||||||
|
|
||||||
CraftingCPURecord(long size, int proc, ICraftingCPU server) {
|
|
||||||
this.size = size;
|
|
||||||
this.processors = proc;
|
|
||||||
this.cpu = server;
|
|
||||||
myName = server.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int compareTo(CraftingCPURecord o)
|
|
||||||
{
|
|
||||||
int a = ItemSorters.compareLong( o.processors, processors );
|
|
||||||
if ( a != 0 )
|
|
||||||
return a;
|
|
||||||
return ItemSorters.compareLong( o.size, size );
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
public ArrayList<CraftingCPURecord> cpus = new ArrayList();
|
public ArrayList<CraftingCPURecord> cpus = new ArrayList();
|
||||||
|
|
||||||
public ContainerCraftConfirm(InventoryPlayer ip, ITerminalHost te) {
|
public ContainerCraftConfirm(InventoryPlayer ip, ITerminalHost te) {
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package appeng.container.implementations;
|
||||||
|
|
||||||
|
import appeng.api.networking.crafting.ICraftingCPU;
|
||||||
|
import appeng.util.ItemSorters;
|
||||||
|
|
||||||
|
public class CraftingCPURecord implements Comparable<CraftingCPURecord>
|
||||||
|
{
|
||||||
|
|
||||||
|
ICraftingCPU cpu;
|
||||||
|
|
||||||
|
long size;
|
||||||
|
int processors;
|
||||||
|
|
||||||
|
public String myName;
|
||||||
|
|
||||||
|
public CraftingCPURecord(long size, int proc, ICraftingCPU server) {
|
||||||
|
this.size = size;
|
||||||
|
this.processors = proc;
|
||||||
|
this.cpu = server;
|
||||||
|
myName = server.getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int compareTo(CraftingCPURecord o)
|
||||||
|
{
|
||||||
|
int a = ItemSorters.compareLong( o.processors, processors );
|
||||||
|
if ( a != 0 )
|
||||||
|
return a;
|
||||||
|
return ItemSorters.compareLong( o.size, size );
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user