From 9a7c6c875f42c03fe81ed89238c95ce590fbd6c7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 31 Oct 2016 10:24:18 +0100 Subject: [PATCH] Rename --- .../refinedstorage/api/util/IItemStackList.java | 2 +- .../apiimpl/autocrafting/task/CraftingTask.java | 6 +++--- .../refinedstorage/apiimpl/util/ItemStackList.java | 4 ++-- ...dItemStackList.java => ItemStackListOredicted.java} | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/{OreDictedItemStackList.java => ItemStackListOredicted.java} (94%) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java index 3dc840d1a..a9da85c19 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/util/IItemStackList.java @@ -134,5 +134,5 @@ public interface IItemStackList { * @return the list wrapped in an ore dictionary optimized {@link IItemStackList} */ @Nonnull - IItemStackList prepOreDict(); + IItemStackList getOredicted(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java index 884f5883c..f4cea618b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java @@ -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 IItemStackList networkList = network.getItemStorageCache().getList().copy(); networkList.clean(); // Remove the zero stacks - networkList = networkList.prepOreDict(); + networkList = networkList.getOredicted(); IFluidStackList networkFluidList = network.getFluidStorageCache().getList().copy(); IItemStackList toInsert = API.instance().createItemStackList(); @@ -261,7 +261,7 @@ public class CraftingTask implements ICraftingTask { @Override public boolean update(Map usedContainers) { - IItemStackList oreDictPrepped = network.getItemStorageCache().getList().prepOreDict(); + IItemStackList oreDictPrepped = network.getItemStorageCache().getList().getOredicted(); if (!missing.isEmpty()) { 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) { 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 (int i = 0; i < step.getPattern().getOutputs().size(); ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java index c2aa6b361..17bf928d9 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackList.java @@ -149,8 +149,8 @@ public class ItemStackList implements IItemStackList { @Nonnull @Override - public IItemStackList prepOreDict() { - return new OreDictedItemStackList(this); + public IItemStackList getOredicted() { + return new ItemStackListOredicted(this); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackListOredicted.java similarity index 94% rename from src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java rename to src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackListOredicted.java index 2735552b3..56c4928c8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/OreDictedItemStackList.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/ItemStackListOredicted.java @@ -13,14 +13,14 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -public class OreDictedItemStackList implements IItemStackList { +public class ItemStackListOredicted implements IItemStackList { private IItemStackList underlyingList; private ArrayListMultimap stacks = ArrayListMultimap.create(); - private OreDictedItemStackList() { + private ItemStackListOredicted() { } - public OreDictedItemStackList(IItemStackList list) { + public ItemStackListOredicted(IItemStackList list) { this.underlyingList = list; initOreDict(); } @@ -135,7 +135,7 @@ public class OreDictedItemStackList implements IItemStackList { @Nonnull @Override public IItemStackList copy() { - OreDictedItemStackList newList = new OreDictedItemStackList(); + ItemStackListOredicted newList = new ItemStackListOredicted(); newList.underlyingList = this.underlyingList.copy(); for (Map.Entry entry : this.stacks.entries()) { newList.stacks.put(entry.getKey(), entry.getValue()); @@ -145,7 +145,7 @@ public class OreDictedItemStackList implements IItemStackList { @Nonnull @Override - public IItemStackList prepOreDict() { + public IItemStackList getOredicted() { return this; } }