From 7a1cf35934ef14c04f884fe6ae34282e1d6243ba Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Fri, 17 Jan 2020 14:31:30 +0800
Subject: 3.3.12

---
 src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java')

diff --git a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
index e2fcecbc8..ca33abdd5 100644
--- a/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
+++ b/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
@@ -21,15 +21,18 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-@Deprecated
+@ApiStatus.Internal
 public class ItemEntryStack extends AbstractEntryStack implements OptimalEntryStack {
     
+    private static final MatrixStack matrices = new MatrixStack();
+    private final ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
     private ItemStack itemStack;
     private int hash = -1;
     
@@ -63,12 +66,11 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
         return itemStack.isEmpty();
     }
     
-    @SuppressWarnings("rawtypes")
     @Override
     public EntryStack copy() {
         EntryStack stack = EntryStack.create(getItemStack().copy());
-        for (Map.Entry<Settings, Object> entry : getSettings().entrySet()) {
-            stack.setting(entry.getKey(), entry.getValue());
+        for (Map.Entry<Settings<?>, Object> entry : getSettings().entrySet()) {
+            stack.setting((Settings<? super Object>) entry.getKey(), entry.getValue());
         }
         return stack;
     }
@@ -127,7 +129,7 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
         //        }
         return hash;
     }
-    
+
     @Nullable
     @Override
     public QueuedTooltip getTooltip(int mouseX, int mouseY) {
@@ -149,9 +151,6 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
         return QueuedTooltip.create(toolTip);
     }
     
-    private static final MatrixStack matrices = new MatrixStack();
-    private final ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
-    
     @Override
     public void render(Rectangle bounds, int mouseX, int mouseY, float delta) {
         optimisedRenderStart(delta);
-- 
cgit