Breaking Change: Change CustomItemWithInventory

Some Tweaks
MModding · Aug 17, 2023 · ef25fdb · ef25fdb
1 parent 8967d92
commit ef25fdb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomItemWithInventory.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomItemWithInventory.java
@@ -49,7 +49,7 @@ public CustomItemWithInventory(DefaultContainer defaultContainer, Settings setti
 		this.inventory.addInventoryClosedListener(this::inventoryClosed);
     }
 
-	public CustomItemWithInventory(int size, TriFunction<Integer, PlayerInventory, Inventory, ScreenHandler> screenHandlerFunc, Settings settings) {
+	public CustomItemWithInventory(TriFunction<Integer, PlayerInventory, Inventory, ScreenHandler> screenHandlerFunc, int size, Settings settings) {
 		super(settings.maxCount(1));
 		this.defaultContainer = DefaultContainer.NULL;
 		this.screenHandlerFunc = screenHandlerFunc;

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/tooltipdata/InventoryTooltipData.java b/src/main/java/com/mmodding/mmodding_lib/library/items/tooltipdata/InventoryTooltipData.java
@@ -93,7 +93,7 @@ public BundleTooltipData toBundleTooltipData() {
             }
             else {
                 content = DefaultedList.of();
-                this.content.stream().filter(stack -> !stack.isEmpty()).forEach(content::add);
+                this.content.stream().filter(stack -> !stack.isEmpty()).forEachOrdered(content::add);
             }
             BasicInventory inventory = BasicInventory.of(content);
             return new BundleTooltipData(inventory.getContent(), this.inventory.getMaxCountPerStack() * this.inventory.size());

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/utils/InventoryUtils.java b/src/main/java/com/mmodding/mmodding_lib/library/utils/InventoryUtils.java
@@ -14,7 +14,7 @@ public class InventoryUtils {
     public static DefaultedList<ItemStack> sort(DefaultedList<ItemStack> content) {
         Map<Pair<Item, NbtCompound>, Integer> items = new HashMap<>();
 
-        content.stream().filter(stack -> !stack.isEmpty()).forEach(stack -> {
+        content.stream().filter(stack -> !stack.isEmpty()).forEachOrdered(stack -> {
             Pair<Item, NbtCompound> item = Pair.of(stack.getItem(), stack.getNbt());
             int count = items.getOrDefault(item, 0);
             items.put(item, count + stack.getCount());