From b6dbf14beaf3ec7fe987c5a1c682f274be5ccb37 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 15 Apr 2023 22:00:39 +0000
Subject: [PATCH 1/3] Update dependency dev.sefiraat:SefiLib to v0.2.6
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 69865c8e..9158a5d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
dev.sefiraat
SefiLib
- 0.1.5.4
+ 0.2.6
compile
From 45b2d599d0ff358e63d4cabbdf79ceb49027730e Mon Sep 17 00:00:00 2001
From: ybw0014
Date: Sun, 2 Jul 2023 17:11:09 -0400
Subject: [PATCH 2/3] Fix cargo dupe
---
pom.xml | 2 +-
.../networks/slimefun/network/NetworkQuantumStorage.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 560f222d..2d463a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
com.github.Slimefun
Slimefun4
- 2c4f886
+ 934ab822a6
provided
diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
index 6309979f..bd33de91 100644
--- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
+++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumStorage.java
@@ -11,6 +11,7 @@
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
+import io.github.thebusybiscuit.slimefun4.core.attributes.DistinctiveItem;
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler;
import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
@@ -42,7 +43,7 @@
import java.util.List;
import java.util.Map;
-public class NetworkQuantumStorage extends SlimefunItem {
+public class NetworkQuantumStorage extends SlimefunItem implements DistinctiveItem {
private static final int[] SIZES = new int[]{
4096,
@@ -449,4 +450,9 @@ public static Map getCaches() {
public static int[] getSizes() {
return SIZES;
}
+
+ @Override
+ public boolean canStack(@Nonnull ItemMeta sfItemMeta, @Nonnull ItemMeta itemMeta) {
+ return sfItemMeta.getPersistentDataContainer().equals(itemMeta.getPersistentDataContainer());
+ }
}
From 1c52c0294587d4ded29d8b87f4358edc18eaacec Mon Sep 17 00:00:00 2001
From: Sefiraat
Date: Sun, 16 Jul 2023 08:06:56 +0100
Subject: [PATCH 3/3] Fix quantum upgrading
---
pom.xml | 2 +-
.../networks/slimefun/network/NetworkQuantumWorkbench.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 07fc57aa..e2069114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
com.github.Slimefun
Slimefun4
- 934ab822a6
+ RC-35
provided
diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java
index 3e069f51..56d05f7f 100644
--- a/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java
+++ b/src/main/java/io/github/sefiraat/networks/slimefun/network/NetworkQuantumWorkbench.java
@@ -165,7 +165,7 @@ public void craft(@Nonnull BlockMenu menu) {
private boolean testRecipe(ItemStack[] input, ItemStack[] recipe) {
for (int test = 0; test < recipe.length; test++) {
- if (!SlimefunUtils.isItemSimilar(input[test], recipe[test], true, false)) {
+ if (!SlimefunUtils.isItemSimilar(input[test], recipe[test], true, false, false)) {
return false;
}
}