From 594049127902ee99a766b2a1ee9a2041e0025a5e Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 19 Apr 2023 21:57:24 +0200 Subject: [PATCH 1/5] Updates SongodaCore to v2.6.20-DEV --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c704c01..8151486 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ com.songoda SongodaCore - 2.6.19-DEV + 2.6.20-DEV compile From 0b5d3481c931eaf358d39fd0d5db20b7e1b74a7c Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 19 Apr 2023 21:58:36 +0200 Subject: [PATCH 2/5] Move from deprecated BlockUtils#updateAdjacentComparators to WorldCore Fixes `java.lang.NoSuchMethodException: org.bukkit.craftbukkit.v1_19_R3.CraftChunk.getHandle()` in a mid-version NMS change in Spigot 1.19.4 --- .../songoda/epichoppers/listeners/HopperListeners.java | 10 +++++++--- .../epichoppers/utils/StorageContainerCache.java | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java b/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java index acb56d4..8868f01 100644 --- a/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java +++ b/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java @@ -1,7 +1,7 @@ package com.songoda.epichoppers.listeners; import com.songoda.core.compatibility.ServerVersion; -import com.songoda.core.utils.BlockUtils; +import com.songoda.core.nms.NmsManager; import com.songoda.epichoppers.EpicHoppers; import com.songoda.epichoppers.hopper.Hopper; import com.songoda.epichoppers.hopper.levels.modules.Module; @@ -139,10 +139,14 @@ public class HopperListeners implements Listener { //event.setItem(moveInstead); // we need to instead cancel and manually remove the item to move source.removeItem(moveInstead); - BlockUtils.updateAdjacentComparators(sourceLocation); + if (sourceLocation != null) { + NmsManager.getWorld().updateAdjacentComparators(sourceLocation.getBlock()); + } // now add it to the hopper destination.addItem(moveInstead); - BlockUtils.updateAdjacentComparators(destinationLocation); + if (destinationLocation != null) { + NmsManager.getWorld().updateAdjacentComparators(destinationLocation.getBlock()); + } } return; } diff --git a/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java b/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java index b0651bf..8bc38e8 100644 --- a/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java +++ b/src/main/java/com/songoda/epichoppers/utils/StorageContainerCache.java @@ -2,7 +2,7 @@ package com.songoda.epichoppers.utils; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.compatibility.ServerVersion; -import com.songoda.core.utils.BlockUtils; +import com.songoda.core.nms.NmsManager; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -112,7 +112,8 @@ public class StorageContainerCache { inventory.setItem(i, cachedInventory[i]); } } - BlockUtils.updateAdjacentComparators(e.getKey().getLocation()); + + NmsManager.getWorld().updateAdjacentComparators(e.getKey()); }); inventoryCache.clear(); } From 47fdae9eaef3a1c8bc65cda9ff786537f8eee050 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 19 Apr 2023 21:59:53 +0200 Subject: [PATCH 3/5] Rename `README.MD` to `README.md` --- README.MD => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.MD => README.md (100%) diff --git a/README.MD b/README.md similarity index 100% rename from README.MD rename to README.md From 90beac6db8b3ed7a1ff92e179630f6a665e2df28 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 22 Apr 2023 17:47:57 +0200 Subject: [PATCH 4/5] Updates SongodaCore to v2.6.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8151486..f27a0fc 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ com.songoda SongodaCore - 2.6.20-DEV + 2.6.20 compile From 7e1cab5d0d47b3dd6c9eca45b81f21f910f4398b Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 22 Apr 2023 17:48:07 +0200 Subject: [PATCH 5/5] Release v4.7.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f27a0fc..7c3f1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicHoppers 4.0.0 - 4.7.8 + 4.7.9 clean install EpicHoppers-${project.version}