From a2630ebee897a96b4192e510409958d9ca19dffc Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Mon, 1 Nov 2021 20:40:45 +0100
Subject: [PATCH 1/4] Updating dependency `com.songoda.skyblock`

---
 pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37cc007..474ac71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,18 +100,13 @@
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
             <version>1.17</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.songoda</groupId>
             <artifactId>skyblock</artifactId>
-            <version>2.2.13</version>
+            <version>2.3.30</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.songoda</groupId>
-                    <artifactId>SongodaCore</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.songoda</groupId>

From 4e2213a6dc111bd26760ea3cb198898c326b9bb1 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Mon, 1 Nov 2021 20:41:45 +0100
Subject: [PATCH 2/4] Replacing dependency `ShopGUIPlus` with latest version of
 its api

The author provides a public version of the API, so let's use this instead
---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 474ac71..a3a3229 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,9 +121,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.brcdev</groupId>
-            <artifactId>ShopGUIPlus</artifactId>
-            <version>1.19.5</version>
+            <groupId>com.github.brcdev-minecraft</groupId>
+            <artifactId>shopgui-api</artifactId>
+            <version>2.2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.songoda</groupId>

From e6518ae91ac31e42ea911a2f451004ee71475d57 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 19 Nov 2021 22:45:34 +0100
Subject: [PATCH 3/4] Adds support for empty particles (-> no particles)

Having the particle name set to an empty string (`''`) now tells EpicHoppers that you don't want any particles
---
 .../com/songoda/epichoppers/hopper/Hopper.java   |  7 +++++--
 .../hopper/levels/modules/ModuleBlockBreak.java  | 16 ++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/songoda/epichoppers/hopper/Hopper.java b/src/main/java/com/songoda/epichoppers/hopper/Hopper.java
index 11f80f2..626baaa 100644
--- a/src/main/java/com/songoda/epichoppers/hopper/Hopper.java
+++ b/src/main/java/com/songoda/epichoppers/hopper/Hopper.java
@@ -125,8 +125,11 @@ public class Hopper {
         }
         Location loc = location.clone().add(.5, .5, .5);
 
-        CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.getParticle(Settings.UPGRADE_PARTICLE_TYPE.getString()),
-                loc, 100, .5, .5, .5);
+        if (!Settings.UPGRADE_PARTICLE_TYPE.getString().trim().isEmpty()) {
+            CompatibleParticleHandler.spawnParticles(
+                    CompatibleParticleHandler.ParticleType.getParticle(Settings.UPGRADE_PARTICLE_TYPE.getString()),
+                    loc, 100, .5, .5, .5);
+        }
 
         if (plugin.getLevelManager().getHighestLevel() != level) {
             player.playSound(player.getLocation(), CompatibleSound.ENTITY_PLAYER_LEVELUP.getSound(), 0.6F, 15.0F);
diff --git a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java b/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
index 59198ee..e8aa490 100644
--- a/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
+++ b/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
@@ -92,14 +92,18 @@ public class ModuleBlockBreak extends Module {
             float yy = (float) (0 + (Math.random() * .5));
             float zz = (float) (0 + (Math.random() * .5));
 
-            Particle particle;
-            try {
-                particle = Particle.valueOf(Settings.BLOCKBREAK_PARTICLE.getString());
-            } catch (Exception e) {
-                particle = Particle.LAVA;
+            Particle particle = null;
+            if (!Settings.BLOCKBREAK_PARTICLE.getString().trim().isEmpty()) {
+                try {
+                    particle = Particle.valueOf(Settings.BLOCKBREAK_PARTICLE.getString());
+                } catch (Exception ignore) {
+                    particle = Particle.LAVA;
+                }
             }
 
-            above.getWorld().spawnParticle(particle, locationAbove, 15, xx, yy, zz);
+            if (particle != null) {
+                above.getWorld().spawnParticle(particle, locationAbove, 15, xx, yy, zz);
+            }
         }
 
         boolean waterlogged = false;

From 81320f2b3b7c1dd167a0d69254190eecc022e3b6 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Fri, 19 Nov 2021 23:22:31 +0100
Subject: [PATCH 4/4] Release v4.6.24

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3a3229..faaf83b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>EpicHoppers</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.6.23</version>
+    <version>4.6.24</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>EpicHoppers-${project.version}</finalName>