From 92cc4920ef2b11b80ec90028174f7980daff979a Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Mon, 3 May 2021 11:55:26 +0200
Subject: [PATCH 1/2] Updated Slimefun integration

---
 pom.xml                                                      | 4 ++--
 src/com/dre/brewery/integration/item/SlimefunPluginItem.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 17858ac..2f12f61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,9 +252,9 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.github.TheBusyBiscuit</groupId>
+			<groupId>com.github.slimefun</groupId>
 			<artifactId>Slimefun4</artifactId>
-			<version>RC-21</version>
+			<version>RC-22</version>
 			<scope>provided</scope>
 		</dependency>
 		<!--<dependency>
diff --git a/src/com/dre/brewery/integration/item/SlimefunPluginItem.java b/src/com/dre/brewery/integration/item/SlimefunPluginItem.java
index e3f72dd..627b71d 100644
--- a/src/com/dre/brewery/integration/item/SlimefunPluginItem.java
+++ b/src/com/dre/brewery/integration/item/SlimefunPluginItem.java
@@ -23,7 +23,7 @@ public class SlimefunPluginItem extends PluginItem {
 		try {
 			SlimefunItem sfItem = SlimefunItem.getByItem(item);
 			if (sfItem != null) {
-				return sfItem.getID().equalsIgnoreCase(getItemId());
+				return sfItem.getId().equalsIgnoreCase(getItemId());
 			}
 		} catch (Throwable e) {
 			e.printStackTrace();

From 4d01fe4b91524ccf96cf0a71ed7fe01d2d26b2bd Mon Sep 17 00:00:00 2001
From: TheBusyBiscuit <mrCookieSlime@gmail.com>
Date: Mon, 3 May 2021 12:28:03 +0200
Subject: [PATCH 2/2] Avoid catching any Throwables

---
 src/com/dre/brewery/integration/item/SlimefunPluginItem.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/dre/brewery/integration/item/SlimefunPluginItem.java b/src/com/dre/brewery/integration/item/SlimefunPluginItem.java
index 627b71d..010f737 100644
--- a/src/com/dre/brewery/integration/item/SlimefunPluginItem.java
+++ b/src/com/dre/brewery/integration/item/SlimefunPluginItem.java
@@ -25,7 +25,7 @@ public class SlimefunPluginItem extends PluginItem {
 			if (sfItem != null) {
 				return sfItem.getId().equalsIgnoreCase(getItemId());
 			}
-		} catch (Throwable e) {
+		} catch (Exception | LinkageError e) {
 			e.printStackTrace();
 			P.p.errorLog("Could not check Slimefun for Item ID");
 			BConfig.hasSlimefun = false;