Rename
This commit is contained in:
@@ -134,5 +134,5 @@ public interface IItemStackList {
|
|||||||
* @return the list wrapped in an ore dictionary optimized {@link IItemStackList}
|
* @return the list wrapped in an ore dictionary optimized {@link IItemStackList}
|
||||||
*/
|
*/
|
||||||
@Nonnull
|
@Nonnull
|
||||||
IItemStackList prepOreDict();
|
IItemStackList getOredicted();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public class CraftingTask implements ICraftingTask {
|
|||||||
// Copy here might be expensive but since it is only executed once it isn't a big impact
|
// Copy here might be expensive but since it is only executed once it isn't a big impact
|
||||||
IItemStackList networkList = network.getItemStorageCache().getList().copy();
|
IItemStackList networkList = network.getItemStorageCache().getList().copy();
|
||||||
networkList.clean(); // Remove the zero stacks
|
networkList.clean(); // Remove the zero stacks
|
||||||
networkList = networkList.prepOreDict();
|
networkList = networkList.getOredicted();
|
||||||
IFluidStackList networkFluidList = network.getFluidStorageCache().getList().copy();
|
IFluidStackList networkFluidList = network.getFluidStorageCache().getList().copy();
|
||||||
IItemStackList toInsert = API.instance().createItemStackList();
|
IItemStackList toInsert = API.instance().createItemStackList();
|
||||||
|
|
||||||
@@ -261,7 +261,7 @@ public class CraftingTask implements ICraftingTask {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean update(Map<ICraftingPatternContainer, Integer> usedContainers) {
|
public boolean update(Map<ICraftingPatternContainer, Integer> usedContainers) {
|
||||||
IItemStackList oreDictPrepped = network.getItemStorageCache().getList().prepOreDict();
|
IItemStackList oreDictPrepped = network.getItemStorageCache().getList().getOredicted();
|
||||||
|
|
||||||
if (!missing.isEmpty()) {
|
if (!missing.isEmpty()) {
|
||||||
for (ItemStack missing : this.missing.getStacks()) {
|
for (ItemStack missing : this.missing.getStacks()) {
|
||||||
@@ -437,7 +437,7 @@ public class CraftingTask implements ICraftingTask {
|
|||||||
if (steps.stream().filter(s -> !s.getPattern().isProcessing()).count() > 0) {
|
if (steps.stream().filter(s -> !s.getPattern().isProcessing()).count() > 0) {
|
||||||
elements.directAdd(new CraftingMonitorElementText("gui.refinedstorage:crafting_monitor.items_crafting", 16));
|
elements.directAdd(new CraftingMonitorElementText("gui.refinedstorage:crafting_monitor.items_crafting", 16));
|
||||||
|
|
||||||
IItemStackList oreDictPrepped = network.getItemStorageCache().getList().prepOreDict();
|
IItemStackList oreDictPrepped = network.getItemStorageCache().getList().getOredicted();
|
||||||
|
|
||||||
for (ICraftingStep step : steps.stream().filter(s -> !s.getPattern().isProcessing()).collect(Collectors.toList())) {
|
for (ICraftingStep step : steps.stream().filter(s -> !s.getPattern().isProcessing()).collect(Collectors.toList())) {
|
||||||
for (int i = 0; i < step.getPattern().getOutputs().size(); ++i) {
|
for (int i = 0; i < step.getPattern().getOutputs().size(); ++i) {
|
||||||
|
|||||||
@@ -149,8 +149,8 @@ public class ItemStackList implements IItemStackList {
|
|||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public IItemStackList prepOreDict() {
|
public IItemStackList getOredicted() {
|
||||||
return new OreDictedItemStackList(this);
|
return new ItemStackListOredicted(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -13,14 +13,14 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class OreDictedItemStackList implements IItemStackList {
|
public class ItemStackListOredicted implements IItemStackList {
|
||||||
private IItemStackList underlyingList;
|
private IItemStackList underlyingList;
|
||||||
private ArrayListMultimap<Integer, ItemStack> stacks = ArrayListMultimap.create();
|
private ArrayListMultimap<Integer, ItemStack> stacks = ArrayListMultimap.create();
|
||||||
|
|
||||||
private OreDictedItemStackList() {
|
private ItemStackListOredicted() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public OreDictedItemStackList(IItemStackList list) {
|
public ItemStackListOredicted(IItemStackList list) {
|
||||||
this.underlyingList = list;
|
this.underlyingList = list;
|
||||||
initOreDict();
|
initOreDict();
|
||||||
}
|
}
|
||||||
@@ -135,7 +135,7 @@ public class OreDictedItemStackList implements IItemStackList {
|
|||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public IItemStackList copy() {
|
public IItemStackList copy() {
|
||||||
OreDictedItemStackList newList = new OreDictedItemStackList();
|
ItemStackListOredicted newList = new ItemStackListOredicted();
|
||||||
newList.underlyingList = this.underlyingList.copy();
|
newList.underlyingList = this.underlyingList.copy();
|
||||||
for (Map.Entry<Integer, ItemStack> entry : this.stacks.entries()) {
|
for (Map.Entry<Integer, ItemStack> entry : this.stacks.entries()) {
|
||||||
newList.stacks.put(entry.getKey(), entry.getValue());
|
newList.stacks.put(entry.getKey(), entry.getValue());
|
||||||
@@ -145,7 +145,7 @@ public class OreDictedItemStackList implements IItemStackList {
|
|||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public IItemStackList prepOreDict() {
|
public IItemStackList getOredicted() {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user