Merge pull request Sefiraat#162 from balugaq/master

fix Sefiraat#159
LobbyTech-MC · Nov 2, 2024 · 893777d · 893777d
2 parents 51cb25d + bc2df84
commit 893777d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ytdd9527.networksexpansion</groupId>
     <artifactId>NetworksExpansion</artifactId>
-    <version>2.1-Alpha-4</version>
+    <version>2.1-Alpha-5</version>
 
     <distributionManagement>
         <repository>

diff --git a/src/main/java/com/balugaq/netex/api/groups/MainItemGroup.java b/src/main/java/com/balugaq/netex/api/groups/MainItemGroup.java
@@ -84,12 +84,12 @@ public void register(@Nonnull SlimefunAddon addon) {
         }
     }
 
-    public void addTo(@Nonnull ItemGroup fatherItemGroup, @Nonnull ItemGroup... itemGroup) {
+    public void addTo(@Nonnull ItemGroup fatherItemGroup, @Nonnull ItemGroup... itemGroups) {
         if (this.fatherItemGroupList.contains(fatherItemGroup) && this.sonItemGroupList.size() > this.fatherItemGroupList.indexOf(fatherItemGroup)) {
-            this.sonItemGroupList.get(this.fatherItemGroupList.indexOf(fatherItemGroup)).addAll(Arrays.stream(itemGroup).toList());
+            this.sonItemGroupList.get(this.fatherItemGroupList.indexOf(fatherItemGroup)).addAll(Arrays.stream(itemGroups).toList());
         } else if (!this.fatherItemGroupList.contains(fatherItemGroup)) {
             this.fatherItemGroupList.add(fatherItemGroup);
-            this.sonItemGroupList.add(new ArrayList<>(Arrays.stream(itemGroup).toList()));
+            this.sonItemGroupList.add(new ArrayList<>(Arrays.stream(itemGroups).toList()));
         }
     }
 

diff --git a/src/main/java/com/balugaq/netex/api/groups/SubFlexItemGroup.java b/src/main/java/com/balugaq/netex/api/groups/SubFlexItemGroup.java
@@ -99,55 +99,58 @@ public void refresh(@Nonnull Player player, @Nonnull PlayerProfile playerProfile
     }
 
     public void addTo(@Nonnull SlimefunItem... slimefunItems) {
-        for (int j = 0; j * 9 < slimefunItems.length; j++) {
-            List<SlimefunItem> slimefunItemList = new ArrayList<>();
-            for (int i = 0; i < 9; i++) {
-                if (j * 9 + i < slimefunItems.length) {
-                    slimefunItemList.add(slimefunItems[j * 9 + i]);
-                }
+        List<SlimefunItem> slimefunItemList = new ArrayList<>();
+        for (SlimefunItem slimefunItem : slimefunItems) {
+            if (slimefunItem != null && !slimefunItem.isDisabled()) {
+                slimefunItemList.add(slimefunItem);
+            }
+            if (slimefunItemList.size() >= 9) {
+                this.slimefunItemList.add(slimefunItemList);
+                slimefunItemList = new ArrayList<>();
             }
+        }
+        if (!slimefunItemList.isEmpty()) {
             this.slimefunItemList.add(slimefunItemList);
         }
-
-        ItemStackUtil.removeDisabledSlimefunItems(this.slimefunItemList);
     }
 
     public void addTo(@Nonnull SlimefunItemStack... slimefunItemStacks) {
-        for (int j = 0; j * 9 < slimefunItemStacks.length; j++) {
-            List<SlimefunItem> slimefunItemList = new ArrayList<>();
-            for (int i = 0; i < 9; i++) {
-                if (j * 9 + i < slimefunItemStacks.length) {
-                    SlimefunItemStack slimefunItemStack = slimefunItemStacks[j * 9 + i];
-                    SlimefunItem slimefunItem = SlimefunItem.getByItem(slimefunItemStack);
-                    if (slimefunItem != null) {
-                        slimefunItemList.add(slimefunItem);
-                    }
-                }
+        List<SlimefunItem> slimefunItemList = new ArrayList<>();
+        for (SlimefunItemStack slimefunItemStack : slimefunItemStacks) {
+            SlimefunItem slimefunItem = SlimefunItem.getByItem(slimefunItemStack);
+            if (slimefunItem != null && !slimefunItem.isDisabled()) {
+                slimefunItemList.add(slimefunItem);
             }
+            if (slimefunItemList.size() >= 9) {
+                this.slimefunItemList.add(slimefunItemList);
+                slimefunItemList = new ArrayList<>();
+            }
+        }
+        if (!slimefunItemList.isEmpty()) {
             this.slimefunItemList.add(slimefunItemList);
         }
-        ItemStackUtil.removeDisabledSlimefunItems(this.slimefunItemList);
     }
 
     public void addTo(@Nonnull List<SlimefunItem> slimefunItemList) {
-        for (int j = 0; j * 9 < slimefunItemList.size(); j++) {
-            List<SlimefunItem> aSlimefunItemList = new ArrayList<>();
-            for (int i = 0; i < 9; i++) {
-                if (j * 9 + i < slimefunItemList.size()) {
-                    slimefunItemList.add(slimefunItemList.get(j * 9 + i));
-                }
+        List<SlimefunItem> slimefunItemList1 = new ArrayList<>();
+        for (SlimefunItem slimefunItem : slimefunItemList) {
+            if (slimefunItem != null && !slimefunItem.isDisabled()) {
+                slimefunItemList1.add(slimefunItem);
             }
-            this.slimefunItemList.add(aSlimefunItemList);
+            if (slimefunItemList1.size() >= 9) {
+                this.slimefunItemList.add(slimefunItemList1);
+                slimefunItemList1 = new ArrayList<>();
+            }
+        }
+        if (!slimefunItemList1.isEmpty()) {
+            this.slimefunItemList.add(slimefunItemList1);
         }
-        ItemStackUtil.removeDisabledSlimefunItems(this.slimefunItemList);
     }
 
     public void addFrom(@Nonnull SubFlexItemGroup... subFlexItemGroups) {
         for (SubFlexItemGroup subFlexItemGroup : subFlexItemGroups) {
             this.slimefunItemList.addAll(subFlexItemGroup.slimefunItemList);
         }
-
-        ItemStackUtil.removeDisabledSlimefunItems(this.slimefunItemList);
     }
 
     public List<SlimefunItem> getSlimefunItems() {

diff --git a/src/main/java/com/ytdd9527/networksexpansion/utils/itemstacks/ItemStackUtil.java b/src/main/java/com/ytdd9527/networksexpansion/utils/itemstacks/ItemStackUtil.java
@@ -993,12 +993,4 @@ public static ItemStack getPreEnchantedItemStack(Material material, boolean hide
         itemStack.setItemMeta(itemMeta);
         return itemStack;
     }
-
-    public static void removeDisabledSlimefunItems(List<List<SlimefunItem>> items) {
-        items.forEach(ItemStackUtil::removeDisabledSlimefunItem);
-    }
-
-    public static void removeDisabledSlimefunItem(List<SlimefunItem> items) {
-        items.removeIf(SlimefunItem::isDisabled);
-    }
 }