From 7a1cf35934ef14c04f884fe6ae34282e1d6243ba Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 17 Jan 2020 14:31:30 +0800 Subject: 3.3.12 --- src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java') diff --git a/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java b/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java index f466447e6..7dda1aedf 100644 --- a/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/EntryRegistryImpl.java @@ -10,18 +10,17 @@ import com.google.common.collect.Queues; import me.shedaniel.rei.api.EntryRegistry; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeHelper; -import me.shedaniel.rei.api.annotations.Internal; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DefaultedList; import net.minecraft.util.Pair; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; -@Deprecated -@Internal +@ApiStatus.Internal public class EntryRegistryImpl implements EntryRegistry { private final CopyOnWriteArrayList entries = Lists.newCopyOnWriteArrayList(); @@ -57,7 +56,7 @@ public class EntryRegistryImpl implements EntryRegistry { @Override public List appendStacksForItem(Item item) { - DefaultedList list = new DefaultedLinkedList(Lists.newLinkedList(), null); + DefaultedList list = new DefaultedLinkedList<>(Lists.newLinkedList(), null); item.appendStacks(item.getGroup(), list); if (list.isEmpty()) list.add(item.getStackForRender()); @@ -81,7 +80,7 @@ public class EntryRegistryImpl implements EntryRegistry { getStacksList().add(stack); } else { int last = getStacksList().size(); - for (int i = last - 1; i >= 0; i++) + for (int i = last - 1; i >= 0; i--) if (getStacksList().get(i).equalsAll(afterEntry)) { last = i + 1; break; @@ -113,7 +112,7 @@ public class EntryRegistryImpl implements EntryRegistry { getStacksList().addAll(stacks); } - private class DefaultedLinkedList extends DefaultedList { + private static class DefaultedLinkedList extends DefaultedList { public DefaultedLinkedList(List delegate, @Nullable E initialElement) { super(delegate, initialElement); } -- cgit