diff --git a/pom.xml b/pom.xml
index f1bbd18a..63b977d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
com.ytdd9527.networksexpansion
NetworksExpansion
- 2.1-Alpha-4
+ 2.1-Alpha-5
diff --git a/src/main/java/com/balugaq/netex/api/groups/MainItemGroup.java b/src/main/java/com/balugaq/netex/api/groups/MainItemGroup.java
index 507f7dd0..10a5a717 100644
--- 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
index bc6e6419..005ee05a 100644
--- 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 slimefunItemList = new ArrayList<>();
- for (int i = 0; i < 9; i++) {
- if (j * 9 + i < slimefunItems.length) {
- slimefunItemList.add(slimefunItems[j * 9 + i]);
- }
+ List 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 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 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 slimefunItemList) {
- for (int j = 0; j * 9 < slimefunItemList.size(); j++) {
- List aSlimefunItemList = new ArrayList<>();
- for (int i = 0; i < 9; i++) {
- if (j * 9 + i < slimefunItemList.size()) {
- slimefunItemList.add(slimefunItemList.get(j * 9 + i));
- }
+ List 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 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
index 01eae15f..a151ffe1 100644
--- 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> items) {
- items.forEach(ItemStackUtil::removeDisabledSlimefunItem);
- }
-
- public static void removeDisabledSlimefunItem(List items) {
- items.removeIf(SlimefunItem::isDisabled);
- }
}