Merge branch 'pre-rewrite/fabric/1.21.2' into pre-rewrite/fabric/DEV

sakura-ryoko · Oct 22, 2024 · df0d640 · df0d640
2 parents 4564da5 + da1d799
commit df0d640
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/fi/dy/masa/itemscroller/util/InventoryUtils.java b/src/main/java/fi/dy/masa/itemscroller/util/InventoryUtils.java
@@ -15,6 +15,8 @@
 import net.minecraft.client.gui.screen.ingame.*;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.component.ComponentChanges;
+import net.minecraft.component.ComponentMap;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.BundleContentsComponent;
 import net.minecraft.component.type.ContainerComponent;
@@ -44,6 +46,7 @@
 import net.minecraft.screen.slot.TradeOutputSlot;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.village.TradeOffer;
 import net.minecraft.village.TradeOfferList;
 import net.minecraft.world.GameRules;

diff --git a/src/main/java/fi/dy/masa/itemscroller/util/SortingCategory.java b/src/main/java/fi/dy/masa/itemscroller/util/SortingCategory.java
@@ -19,7 +19,7 @@
 public class SortingCategory implements IConfigLockedListType
 {
     public static final SortingCategory INSTANCE = new SortingCategory();
-    public ImmutableList<SortingCategory.Entry> VALUES = ImmutableList.copyOf(SortingCategory.Entry.values());
+    public ImmutableList<Entry> VALUES = ImmutableList.copyOf(Entry.values());
 
     @Nullable
     public ItemGroup.DisplayContext buildDisplayContext(MinecraftClient mc)