From d4ee4597f082f1de857f0d7c1b2e25ba84040af3 Mon Sep 17 00:00:00 2001 From: Nathat23 Date: Sun, 16 Jun 2024 09:51:24 +0100 Subject: [PATCH 01/17] fix jobs dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cdfcfbb..9e1dd520 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ com.github.Zrips Jobs - 4.17.2 + v5.2.2.3 provided From 8b23c18298f62e6539a3953e4b0a8c2bcf5d286d Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Fri, 12 Jul 2024 02:44:54 +0200 Subject: [PATCH 02/17] add spark dependency --- pom.xml | 10 ++++++++++ src/main/resources/plugin.yml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e1dd520..ba37d6fe 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,10 @@ sonatype-oss-snapshots1 https://s01.oss.sonatype.org/content/repositories/snapshots/ + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + @@ -202,6 +206,12 @@ adventure-platform-bukkit 4.3.3-SNAPSHOT + + me.lucko + spark-api + 0.1-SNAPSHOT + provided + diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 84fdb918..d18284ac 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ version: ${project.version} api-version: 1.16 folia-supported: true depend: [ProtocolLib] -softdepend: [WorldGuard, MythicMobs, ClearLag, MyPet, mcMMO, Jobs, Citizens] +softdepend: [WorldGuard, MythicMobs, ClearLag, MyPet, mcMMO, Jobs, Citizens, Spark] author: antiPerson website: https://www.spigotmc.org/resources/stackmob-enhance-your-servers-performance-without-the-sacrifice.29999/ description: A plugin that aims to improve performance by 'stacking' entities together, with attempts to preserve game mechanics. From 45925b2a761442e669076d75b7a12b241c16bde6 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Fri, 12 Jul 2024 02:45:43 +0200 Subject: [PATCH 03/17] add mspt-reactive settings --- .../antiperson/stackmob/config/EntityConfig.java | 16 ++++++++++++++++ src/main/resources/config.yml | 11 +++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java b/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java index 52cce46d..f91f3752 100644 --- a/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java +++ b/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java @@ -118,6 +118,22 @@ public String getTagFormat() { return getString("display-name.format"); } + public boolean isMsptReactiveEnabled() { + return getBoolean("mspt-reactive.enabled"); + } + + public double getMsptReactiveTriggerThreshold() { + return getDouble("mspt-reactive.trigger-mspt-threshold"); + } + + public double getMsptReactiveUntriggerThreshold() { + return getDouble("mspt-reactive.untrigger-mspt-threshold"); + } + + public int getMsptReactiveCollectionPeriod() { + return getInt("mspt-reactive.check-period"); + } + public int getTagThreshold() { return getInt( "display-name.threshold"); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a45d13eb..0df64db6 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -302,6 +302,17 @@ wait-to-stack: - SPAWNER reasons-whitelist-invert: false +# Enable the system based on mspt +mspt-reactive: + enabled: false + # Above what MSPT should the reactive mode be triggered? + trigger-mspt-threshold: 65.0 + # Below what MSPT should the reactive mode be untriggered? + untrigger-mspt-threshold: 45.0 + # Over how many ticks should we collect tick durations for getting the MSPT? + check-period: 1200 + + # Enable/disable integration with other plugins. (*) hooks: # Allows the custom 'entity-stacking' flag to be used in worldguard regions. From 378972578318219d0de6f8199bba8d841a18b294 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Fri, 12 Jul 2024 03:10:13 +0200 Subject: [PATCH 04/17] check period should use stack.interval --- src/main/java/uk/antiperson/stackmob/config/EntityConfig.java | 4 ---- src/main/resources/config.yml | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java b/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java index f91f3752..5f442803 100644 --- a/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java +++ b/src/main/java/uk/antiperson/stackmob/config/EntityConfig.java @@ -130,10 +130,6 @@ public double getMsptReactiveUntriggerThreshold() { return getDouble("mspt-reactive.untrigger-mspt-threshold"); } - public int getMsptReactiveCollectionPeriod() { - return getInt("mspt-reactive.check-period"); - } - public int getTagThreshold() { return getInt( "display-name.threshold"); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0df64db6..d0126235 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -302,15 +302,13 @@ wait-to-stack: - SPAWNER reasons-whitelist-invert: false -# Enable the system based on mspt +# Enable the system based on MSPT. The MSPT will be updated as often as stack.interval mspt-reactive: enabled: false # Above what MSPT should the reactive mode be triggered? trigger-mspt-threshold: 65.0 # Below what MSPT should the reactive mode be untriggered? untrigger-mspt-threshold: 45.0 - # Over how many ticks should we collect tick durations for getting the MSPT? - check-period: 1200 # Enable/disable integration with other plugins. (*) From a0749f325f9fc1cb2290c6eca94281b6c0c8ee0d Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Fri, 12 Jul 2024 03:11:00 +0200 Subject: [PATCH 05/17] add mspt provider (spark when available, else, dummy) --- .../java/uk/antiperson/stackmob/StackMob.java | 13 ++++++++ .../stackmob/mspt/DummyMsptProvider.java | 17 ++++++++++ .../stackmob/mspt/MsptProvider.java | 9 +++++ .../stackmob/mspt/SparkMsptProvider.java | 33 +++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java create mode 100644 src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java create mode 100644 src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java diff --git a/src/main/java/uk/antiperson/stackmob/StackMob.java b/src/main/java/uk/antiperson/stackmob/StackMob.java index f344187e..d4f7725a 100644 --- a/src/main/java/uk/antiperson/stackmob/StackMob.java +++ b/src/main/java/uk/antiperson/stackmob/StackMob.java @@ -16,6 +16,9 @@ import uk.antiperson.stackmob.entity.traits.TraitManager; import uk.antiperson.stackmob.hook.HookManager; import uk.antiperson.stackmob.listeners.*; +import uk.antiperson.stackmob.mspt.DummyMsptProvider; +import uk.antiperson.stackmob.mspt.MsptProvider; +import uk.antiperson.stackmob.mspt.SparkMsptProvider; import uk.antiperson.stackmob.packets.PlayerManager; import uk.antiperson.stackmob.scheduler.BukkitScheduler; import uk.antiperson.stackmob.scheduler.FoliaScheduler; @@ -47,6 +50,7 @@ public class StackMob extends JavaPlugin { private PlayerManager playerManager; private BukkitAudiences adventure; private Scheduler scheduler; + private MsptProvider msptProvider; private boolean stepDamageError; @@ -123,6 +127,11 @@ public void onEnable() { getLogger().warning("It has been detected that you are not using Paper (https://papermc.io)."); getLogger().warning("StackMob makes use of Paper's API, which means you're missing out on features."); } + if (this.getServer().getPluginManager().getPlugin("Spark") != null){ + this.msptProvider = new SparkMsptProvider(); + } else { + this.msptProvider = new DummyMsptProvider(); + } new Metrics(this, 522); } @@ -179,6 +188,10 @@ private void registerEvent(Class clazz) throws NoSuchMethodE getServer().getPluginManager().registerEvents(listener, this); } + public MsptProvider getMsptProvider() { + return msptProvider; + } + public EntityTranslation getEntityTranslation() { return entityTranslation; } diff --git a/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java new file mode 100644 index 00000000..ee918f9f --- /dev/null +++ b/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java @@ -0,0 +1,17 @@ +package uk.antiperson.stackmob.mspt; + +public class DummyMsptProvider implements MsptProvider { + + @Override + public double getMspt() { + return 0; + } + + @Override + public void setUnderLoad(boolean underLoad) { } + + @Override + public boolean isUnderLoad() { + return false; + } +} diff --git a/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java new file mode 100644 index 00000000..32fef4be --- /dev/null +++ b/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java @@ -0,0 +1,9 @@ +package uk.antiperson.stackmob.mspt; + +public interface MsptProvider { + + double getMspt(); + void setUnderLoad(boolean underLoad); + boolean isUnderLoad(); + +} diff --git a/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java new file mode 100644 index 00000000..e33d2d98 --- /dev/null +++ b/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java @@ -0,0 +1,33 @@ +package uk.antiperson.stackmob.mspt; + +import me.lucko.spark.api.Spark; +import me.lucko.spark.api.SparkProvider; +import me.lucko.spark.api.statistic.StatisticWindow; + +public class SparkMsptProvider implements MsptProvider { + + Spark spark; + boolean underLoad; + + public SparkMsptProvider(){ + this.spark = SparkProvider.get(); + } + + @Override + public double getMspt() { + if(this.spark.mspt() == null){ + return 0; + } + return this.spark.mspt().poll(StatisticWindow.MillisPerTick.SECONDS_10).mean(); + } + + @Override + public void setUnderLoad(boolean underLoad) { + this.underLoad = underLoad; + } + + @Override + public boolean isUnderLoad() { + return this.underLoad; + } +} From ea69a4fcd0fee57681c547f1938ea7130a16b2a1 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Fri, 12 Jul 2024 03:11:11 +0200 Subject: [PATCH 06/17] mspt hysteresis check --- .../uk/antiperson/stackmob/tasks/MergeTask.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java b/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java index 723a0b07..3ca1312e 100644 --- a/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java +++ b/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java @@ -19,6 +19,23 @@ public MergeTask(StackMob sm) { } private void checkEntity(StackEntity original, boolean checkHasMoved, double checkHasMovedDistance) { + if(original.getEntityConfig().isMsptReactiveEnabled()){ + if (sm.getMsptProvider().isUnderLoad()){ + if (sm.getMsptProvider().getMspt()<=original.getEntityConfig().getMsptReactiveUntriggerThreshold()){ + // mspt was under heavy load, but no longer is, reset its status and skip stacking + sm.getMsptProvider().setUnderLoad(false); + return; + } + } else { + if (sm.getMsptProvider().getMspt()>=original.getEntityConfig().getMsptReactiveTriggerThreshold()){ + // mspt is considered to be under heavy load, set under load to keep hysteresis status + sm.getMsptProvider().setUnderLoad(true); + } else { + // mspt is lower than the trigger threshold, skip stacking + return; + } + } + } if (original.isWaiting()) { original.incrementWait(); return; From bdfe3a6e81b23d716c4ecb079e44fedb8152fac9 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Fri, 12 Jul 2024 03:21:27 +0200 Subject: [PATCH 07/17] add paper mspt provider --- src/main/java/uk/antiperson/stackmob/StackMob.java | 3 +++ .../stackmob/mspt/DummyMsptProvider.java | 2 +- .../uk/antiperson/stackmob/mspt/MsptProvider.java | 14 ++++++++++---- .../stackmob/mspt/PaperMsptProvider.java | 11 +++++++++++ .../stackmob/mspt/SparkMsptProvider.java | 12 +----------- src/main/resources/config.yml | 1 + 6 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 src/main/java/uk/antiperson/stackmob/mspt/PaperMsptProvider.java diff --git a/src/main/java/uk/antiperson/stackmob/StackMob.java b/src/main/java/uk/antiperson/stackmob/StackMob.java index d4f7725a..67f97a98 100644 --- a/src/main/java/uk/antiperson/stackmob/StackMob.java +++ b/src/main/java/uk/antiperson/stackmob/StackMob.java @@ -18,6 +18,7 @@ import uk.antiperson.stackmob.listeners.*; import uk.antiperson.stackmob.mspt.DummyMsptProvider; import uk.antiperson.stackmob.mspt.MsptProvider; +import uk.antiperson.stackmob.mspt.PaperMsptProvider; import uk.antiperson.stackmob.mspt.SparkMsptProvider; import uk.antiperson.stackmob.packets.PlayerManager; import uk.antiperson.stackmob.scheduler.BukkitScheduler; @@ -129,6 +130,8 @@ public void onEnable() { } if (this.getServer().getPluginManager().getPlugin("Spark") != null){ this.msptProvider = new SparkMsptProvider(); + } else if (Utilities.isPaper()) { + this.msptProvider = new PaperMsptProvider(); } else { this.msptProvider = new DummyMsptProvider(); } diff --git a/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java index ee918f9f..cefc8914 100644 --- a/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java +++ b/src/main/java/uk/antiperson/stackmob/mspt/DummyMsptProvider.java @@ -1,6 +1,6 @@ package uk.antiperson.stackmob.mspt; -public class DummyMsptProvider implements MsptProvider { +public class DummyMsptProvider extends MsptProvider { @Override public double getMspt() { diff --git a/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java index 32fef4be..cf9379be 100644 --- a/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java +++ b/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java @@ -1,9 +1,15 @@ package uk.antiperson.stackmob.mspt; -public interface MsptProvider { +public abstract class MsptProvider { - double getMspt(); - void setUnderLoad(boolean underLoad); - boolean isUnderLoad(); + boolean underLoad; + + public abstract double getMspt(); + public void setUnderLoad(boolean underLoad) { + this.underLoad = underLoad; + } + public boolean isUnderLoad() { + return this.underLoad; + } } diff --git a/src/main/java/uk/antiperson/stackmob/mspt/PaperMsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/PaperMsptProvider.java new file mode 100644 index 00000000..dd649dee --- /dev/null +++ b/src/main/java/uk/antiperson/stackmob/mspt/PaperMsptProvider.java @@ -0,0 +1,11 @@ +package uk.antiperson.stackmob.mspt; + +import org.bukkit.Bukkit; + +public class PaperMsptProvider extends MsptProvider { + + @Override + public double getMspt() { + return Bukkit.getAverageTickTime(); + } +} diff --git a/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java index e33d2d98..f7d4f939 100644 --- a/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java +++ b/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java @@ -4,7 +4,7 @@ import me.lucko.spark.api.SparkProvider; import me.lucko.spark.api.statistic.StatisticWindow; -public class SparkMsptProvider implements MsptProvider { +public class SparkMsptProvider extends MsptProvider { Spark spark; boolean underLoad; @@ -20,14 +20,4 @@ public double getMspt() { } return this.spark.mspt().poll(StatisticWindow.MillisPerTick.SECONDS_10).mean(); } - - @Override - public void setUnderLoad(boolean underLoad) { - this.underLoad = underLoad; - } - - @Override - public boolean isUnderLoad() { - return this.underLoad; - } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index d0126235..f0fa0594 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -303,6 +303,7 @@ wait-to-stack: reasons-whitelist-invert: false # Enable the system based on MSPT. The MSPT will be updated as often as stack.interval +# you should use paper or install Spark for this feature to work! mspt-reactive: enabled: false # Above what MSPT should the reactive mode be triggered? From 18a360dd19aeed7f24728a1ba7f717c3584423cf Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Mon, 15 Jul 2024 11:13:35 +0200 Subject: [PATCH 08/17] make underLoad private --- src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java index cf9379be..e2eb3e47 100644 --- a/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java +++ b/src/main/java/uk/antiperson/stackmob/mspt/MsptProvider.java @@ -2,7 +2,7 @@ public abstract class MsptProvider { - boolean underLoad; + private boolean underLoad; public abstract double getMspt(); public void setUnderLoad(boolean underLoad) { From c543c87dc1ff4fde882bdfd270b5258793443744 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Mon, 15 Jul 2024 11:14:05 +0200 Subject: [PATCH 09/17] remove unused variable, make spark private+final --- .../java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java b/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java index f7d4f939..71154f0d 100644 --- a/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java +++ b/src/main/java/uk/antiperson/stackmob/mspt/SparkMsptProvider.java @@ -6,8 +6,7 @@ public class SparkMsptProvider extends MsptProvider { - Spark spark; - boolean underLoad; + private final Spark spark; public SparkMsptProvider(){ this.spark = SparkProvider.get(); From a7dd24083606fa25becd134cc0e28ef052e01d38 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Mon, 15 Jul 2024 11:52:17 +0200 Subject: [PATCH 10/17] add paper dependency indicator --- src/main/resources/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index f0fa0594..c967dbc3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -303,7 +303,7 @@ wait-to-stack: reasons-whitelist-invert: false # Enable the system based on MSPT. The MSPT will be updated as often as stack.interval -# you should use paper or install Spark for this feature to work! +# you should use paper or install Spark for this feature to work! (**) mspt-reactive: enabled: false # Above what MSPT should the reactive mode be triggered? From 9ffbc41393d2d056fe8f66c7721cd809dee64833 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:07:59 +0100 Subject: [PATCH 11/17] remove adventure api (same as master) --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 3137aabd..409e8a7c 100644 --- a/pom.xml +++ b/pom.xml @@ -177,11 +177,6 @@ system ${project.basedir}/jars/MyPet-3.11-SNAPSHOT-B1627.jar - - net.kyori - adventure-platform-bukkit - 4.3.3-SNAPSHOT - me.lucko spark-api From d2449772fe37bb118af667df5e252f537d4b566d Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:08:29 +0100 Subject: [PATCH 12/17] match master --- src/main/java/uk/antiperson/stackmob/StackMob.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/antiperson/stackmob/StackMob.java b/src/main/java/uk/antiperson/stackmob/StackMob.java index 5ec2e565..df4b9140 100644 --- a/src/main/java/uk/antiperson/stackmob/StackMob.java +++ b/src/main/java/uk/antiperson/stackmob/StackMob.java @@ -18,7 +18,6 @@ import uk.antiperson.stackmob.mspt.MsptProvider; import uk.antiperson.stackmob.mspt.PaperMsptProvider; import uk.antiperson.stackmob.mspt.SparkMsptProvider; -import uk.antiperson.stackmob.packets.PlayerManager; import uk.antiperson.stackmob.scheduler.BukkitScheduler; import uk.antiperson.stackmob.scheduler.FoliaScheduler; import uk.antiperson.stackmob.scheduler.Scheduler; From 2b4f1cf943e56b93e1f0714634194d700ec4d1c6 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:09:06 +0100 Subject: [PATCH 13/17] use new paper repo --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 409e8a7c..8c00ef82 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ papermc - https://papermc.io/repo/repository/maven-public/ + https://repo.papermc.io/repository/maven-public/ CodeMC From 29aead0e585da545f3a07e1ccc3de85fe2dccef9 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:10:58 +0100 Subject: [PATCH 14/17] update jobs dependency (old version is not resolvable) --- pom.xml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 8c00ef82..f6eabd35 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ papermc - https://repo.papermc.io/repository/maven-public/ + https://papermc.io/repo/repository/maven-public/ CodeMC @@ -114,10 +114,6 @@ sonatype-oss-snapshots1 https://s01.oss.sonatype.org/content/repositories/snapshots/ - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - @@ -177,12 +173,6 @@ system ${project.basedir}/jars/MyPet-3.11-SNAPSHOT-B1627.jar - - me.lucko - spark-api - 0.1-SNAPSHOT - provided - - + \ No newline at end of file From d9a2565f580056819455d74127d3cac9a6e4c41c Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:11:34 +0100 Subject: [PATCH 15/17] remove unused import --- src/main/java/uk/antiperson/stackmob/StackMob.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/uk/antiperson/stackmob/StackMob.java b/src/main/java/uk/antiperson/stackmob/StackMob.java index df4b9140..ee59d5d1 100644 --- a/src/main/java/uk/antiperson/stackmob/StackMob.java +++ b/src/main/java/uk/antiperson/stackmob/StackMob.java @@ -1,7 +1,6 @@ package uk.antiperson.stackmob; import org.bstats.bukkit.Metrics; -import org.bukkit.Bukkit; import org.bukkit.NamespacedKey; import org.bukkit.command.PluginCommand; import org.bukkit.event.Listener; From 132523d7c5cf6c73ec5df2db5b5a36a7cee1dc08 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:21:41 +0100 Subject: [PATCH 16/17] do a single check at the beginning (satisfies ploppyperson request) --- src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java b/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java index de0e7bc3..33c99f43 100644 --- a/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java +++ b/src/main/java/uk/antiperson/stackmob/tasks/MergeTask.java @@ -18,8 +18,8 @@ public MergeTask(StackMob sm) { this.sm = sm; } - private void checkEntity(StackEntity original, boolean checkHasMoved, double checkHasMovedDistance) { - if(original.getEntityConfig().isMsptReactiveEnabled()){ + private void checkEntity(StackEntity original, boolean checkHasMoved, double checkHasMovedDistance, boolean checkMspt) { + if(checkMspt){ if (sm.getMsptProvider().isUnderLoad()){ if (sm.getMsptProvider().getMspt()<=original.getEntityConfig().getMsptReactiveUntriggerThreshold()){ // mspt was under heavy load, but no longer is, reset its status and skip stacking @@ -118,8 +118,9 @@ private void removeEntity(StackEntity stackEntity) { public void run() { boolean checkHasMoved = sm.getMainConfig().getConfig().isCheckHasMoved(); double checkHasMovedDistance = sm.getMainConfig().getConfig().getCheckHasMovedDistance(); + boolean checkMspt = sm.getMainConfig().getConfig().isMsptReactiveEnabled(); for (StackEntity original : sm.getEntityManager().getStackEntities()) { - Runnable runnable = () -> checkEntity(original, checkHasMoved, checkHasMovedDistance); + Runnable runnable = () -> checkEntity(original, checkHasMoved, checkHasMovedDistance, checkMspt); if (Utilities.IS_FOLIA) { sm.getScheduler().runTask(original.getEntity(), runnable); } else { From 913566e24bd45a60e0baf69414cdd4a924a08768 Mon Sep 17 00:00:00 2001 From: quiquelhappy Date: Sun, 26 Jan 2025 20:21:56 +0100 Subject: [PATCH 17/17] re-add spark dependency I removed during the merge --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index f6eabd35..f4b882e2 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,12 @@ system ${project.basedir}/jars/MyPet-3.11-SNAPSHOT-B1627.jar + + me.lucko + spark-api + 0.1-SNAPSHOT + provided + \ No newline at end of file