From 4ecd71dea58692d8f35eec627b5f6ed70ebde30a Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Wed, 1 Oct 2025 00:07:54 +0200 Subject: [PATCH 1/7] add 1.21.9 downloads --- .../src/main/resources/files/versions.json | 61 +++++++++++++++++-- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/node/impl/src/main/resources/files/versions.json b/node/impl/src/main/resources/files/versions.json index 2723cff6fd..c4e90c9901 100644 --- a/node/impl/src/main/resources/files/versions.json +++ b/node/impl/src/main/resources/files/versions.json @@ -89,8 +89,23 @@ "website": "https://papermc.io", "versions": [ { - "name": "1.21.8", + "name": "1.21.9", "cacheFiles": false, + "properties": { + "copy": { + "cache/.*": "/", + "versions/.*": "/", + "paper\\.jar": "paper.jar" + }, + "jvmOptions": [ + "-Dpaperclip.patchonly=true" + ], + "fetchOverPaperApi": true, + "versionGroup": "1.21.9" + } + }, + { + "name": "1.21.8", "properties": { "copy": { "cache/.*": "/", @@ -345,10 +360,24 @@ "COPY_FILTER" ], "versions": [ + { + "name": "1.21.9", + "url": "https://api.purpurmc.org/v2/purpur/1.21.9/latest/download", + "cacheFiles": false, + "properties": { + "copy": { + "cache/.*": "/", + "versions/.*": "/", + "purpur\\.jar": "paper.jar" + }, + "jvmOptions": [ + "-Dpaperclip.patchonly=true" + ] + } + }, { "name": "1.21.8", "url": "https://api.purpurmc.org/v2/purpur/1.21.8/latest/download", - "cacheFiles": false, "properties": { "copy": { "cache/.*": "/", @@ -457,9 +486,13 @@ "DOWNLOAD" ], "versions": [ + { + "name": "1.21.9", + "url": "https://s3.mcjars.app/spigot/1.21.9/4536/server.jar" + }, { "name": "1.21.8", - "url": "https://s3.mcjars.app/spigot/1.21.8/4524/server.jar" + "url": "https://s3.mcjars.app/spigot/1.21.8/4534/server.jar" }, { "name": "1.21.6", @@ -548,6 +581,26 @@ ], "website": "https://fabricmc.net", "versions": [ + { + "name": "1.21.9", + "cacheFiles": false, + "properties": { + "copy": { + "fabric-server-launch\\.jar": "fabric.jar", + "libraries/.*": "/", + "versions/.*": "/", + "server\\.jar": "server.jar" + }, + "parameters": [ + "server", + "-mcversion", + "%version%", + "-downloadMinecraft" + ], + "fetchOverFabricApi": true + }, + "minJavaVersion": 21 + }, { "name": "1.21.8", "cacheFiles": false, @@ -750,7 +803,7 @@ "versions": [ { "name": "1.21.8", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.8/58/server.jar" + "url": "https://s3.mcjars.app/loohp-limbo/1.21.8/59/server.jar" }, { "name": "1.21.6", From 62e76a9e68897c984c577c674b9158cb3e7dfa2d Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Wed, 1 Oct 2025 16:31:24 +0200 Subject: [PATCH 2/7] update spigot, add limbo 1.21.9 download --- node/impl/src/main/resources/files/versions.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/node/impl/src/main/resources/files/versions.json b/node/impl/src/main/resources/files/versions.json index c4e90c9901..da11659446 100644 --- a/node/impl/src/main/resources/files/versions.json +++ b/node/impl/src/main/resources/files/versions.json @@ -488,7 +488,7 @@ "versions": [ { "name": "1.21.9", - "url": "https://s3.mcjars.app/spigot/1.21.9/4536/server.jar" + "url": "https://s3.mcjars.app/spigot/1.21.9/4537/server.jar" }, { "name": "1.21.8", @@ -801,6 +801,10 @@ "DOWNLOAD" ], "versions": [ + { + "name": "1.21.9", + "url": "https://s3.mcjars.app/loohp-limbo/1.21.9/60/server.jar" + }, { "name": "1.21.8", "url": "https://s3.mcjars.app/loohp-limbo/1.21.8/59/server.jar" From 3a7258694b4bda7aaaa44b03a9e5e9d1cf792c83 Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Wed, 1 Oct 2025 16:33:43 +0200 Subject: [PATCH 3/7] update all mcjars download urls --- .../src/main/resources/files/versions.json | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/node/impl/src/main/resources/files/versions.json b/node/impl/src/main/resources/files/versions.json index da11659446..3334aee440 100644 --- a/node/impl/src/main/resources/files/versions.json +++ b/node/impl/src/main/resources/files/versions.json @@ -488,84 +488,84 @@ "versions": [ { "name": "1.21.9", - "url": "https://s3.mcjars.app/spigot/1.21.9/4537/server.jar" + "url": "https://files.mcjars.app/spigot/1.21.9/4537/server.jar" }, { "name": "1.21.8", - "url": "https://s3.mcjars.app/spigot/1.21.8/4534/server.jar" + "url": "https://files.mcjars.app/spigot/1.21.8/4534/server.jar" }, { "name": "1.21.6", - "url": "https://s3.mcjars.app/spigot/1.21.6/4518/server.jar" + "url": "https://files.mcjars.app/spigot/1.21.6/4518/server.jar" }, { "name": "1.21.5", - "url": "https://s3.mcjars.app/spigot/1.21.5/4504/server.jar", + "url": "https://files.mcjars.app/spigot/1.21.5/4504/server.jar", "deprecated": true }, { "name": "1.20.6", - "url": "https://s3.mcjars.app/spigot/1.20.6/4135/server.jar", + "url": "https://files.mcjars.app/spigot/1.20.6/4135/server.jar", "deprecated": true }, { "name": "1.19.4", - "url": "https://s3.mcjars.app/spigot/1.19.4/3763/server.jar", + "url": "https://files.mcjars.app/spigot/1.19.4/3763/server.jar", "deprecated": true }, { "name": "1.18.2", - "url": "https://s3.mcjars.app/spigot/1.18.2/3498/server.jar", + "url": "https://files.mcjars.app/spigot/1.18.2/3498/server.jar", "deprecated": true }, { "name": "1.17.1", - "url": "https://s3.mcjars.app/spigot/1.17.1/3284/server.jar", + "url": "https://files.mcjars.app/spigot/1.17.1/3284/server.jar", "deprecated": true }, { "name": "1.16.5", - "url": "https://s3.mcjars.app/spigot/1.16.5/3096/server.jar", + "url": "https://files.mcjars.app/spigot/1.16.5/3096/server.jar", "deprecated": true }, { "name": "1.15.2", - "url": "https://s3.mcjars.app/spigot/1.15.2/2703/server.jar", + "url": "https://files.mcjars.app/spigot/1.15.2/2703/server.jar", "deprecated": true }, { "name": "1.14.4", - "url": "https://s3.mcjars.app/spigot/1.14.4/2502/server.jar", + "url": "https://files.mcjars.app/spigot/1.14.4/2502/server.jar", "deprecated": true }, { "name": "1.13.2", - "url": "https://s3.mcjars.app/spigot/1.13.2/2148/server.jar", + "url": "https://files.mcjars.app/spigot/1.13.2/2148/server.jar", "deprecated": true }, { "name": "1.12.2", - "url": "https://s3.mcjars.app/spigot/1.12.2/1573/server.jar", + "url": "https://files.mcjars.app/spigot/1.12.2/1573/server.jar", "deprecated": true }, { "name": "1.11.2", - "url": "https://s3.mcjars.app/spigot/1.11.2/1251/server.jar", + "url": "https://files.mcjars.app/spigot/1.11.2/1251/server.jar", "deprecated": true }, { "name": "1.10.2", - "url": "https://s3.mcjars.app/spigot/1.10.2/986/server.jar", + "url": "https://files.mcjars.app/spigot/1.10.2/986/server.jar", "deprecated": true }, { "name": "1.9.4", - "url": "https://s3.mcjars.app/spigot/1.9.4/849/server.jar", + "url": "https://files.mcjars.app/spigot/1.9.4/849/server.jar", "deprecated": true }, { "name": "1.8.8", - "url": "https://s3.mcjars.app/spigot/1.8.8/582/server.jar", + "url": "https://files.mcjars.app/spigot/1.8.8/582/server.jar", "deprecated": true } ] @@ -803,35 +803,35 @@ "versions": [ { "name": "1.21.9", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.9/60/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.9/60/server.jar" }, { "name": "1.21.8", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.8/59/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.8/59/server.jar" }, { "name": "1.21.6", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.6/54/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.6/54/server.jar" }, { "name": "1.21.5", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.5/52/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.5/52/server.jar" }, { "name": "1.21.4", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.4/51/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.4/51/server.jar" }, { "name": "1.21.3", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.3/47/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.3/47/server.jar" }, { "name": "1.21.1", - "url": "https://s3.mcjars.app/loohp-limbo/1.21.1/46/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.1/46/server.jar" }, { "name": "1.20.6", - "url": "https://s3.mcjars.app/loohp-limbo/1.20.6/43/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.20.6/43/server.jar" } ] } From ba8aa524a5d0a770ec53ffe64d7a70ff5047f51f Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Wed, 1 Oct 2025 17:19:53 +0200 Subject: [PATCH 4/7] update npc lib to beta.14 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1d198db989..66611559ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -70,7 +70,7 @@ limboloohp = "0.7.9-ALPHA" # platform extensions adventure = "4.24.0" modlauncher = "8.1.3" -npcLib = "3.0.0-beta13" +npcLib = "3.0.0-beta.14" packetEvents = "2.9.5" placeholderApi = "2.11.6" adventure-serializer-bungee = "4.4.1" From adbabe70942b143f5ee9d937c918b90413c17680 Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Mon, 6 Oct 2025 20:16:24 +0200 Subject: [PATCH 5/7] update to npc-lib beta.15 --- gradle/libs.versions.toml | 2 +- .../modules/npc/configuration/NPCPoolOptions.java | 13 +++---------- .../modules/npc/impl/node/CloudNetNPCModule.java | 6 ------ .../bukkit/BukkitPlatformNPCManagement.java | 3 +-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 66611559ca..eeb6206eed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -70,7 +70,7 @@ limboloohp = "0.7.9-ALPHA" # platform extensions adventure = "4.24.0" modlauncher = "8.1.3" -npcLib = "3.0.0-beta.14" +npcLib = "3.0.0-beta.15" packetEvents = "2.9.5" placeholderApi = "2.11.6" adventure-serializer-bungee = "4.4.1" diff --git a/modules/npcs/api/src/main/java/eu/cloudnetservice/modules/npc/configuration/NPCPoolOptions.java b/modules/npcs/api/src/main/java/eu/cloudnetservice/modules/npc/configuration/NPCPoolOptions.java index 08dd11660a..63007b218d 100644 --- a/modules/npcs/api/src/main/java/eu/cloudnetservice/modules/npc/configuration/NPCPoolOptions.java +++ b/modules/npcs/api/src/main/java/eu/cloudnetservice/modules/npc/configuration/NPCPoolOptions.java @@ -18,7 +18,7 @@ import lombok.NonNull; -public record NPCPoolOptions(int spawnDistance, int actionDistance, int tabListRemoveTicks) { +public record NPCPoolOptions(int spawnDistance, int actionDistance) { public static @NonNull Builder builder() { return new Builder(); @@ -27,15 +27,13 @@ public record NPCPoolOptions(int spawnDistance, int actionDistance, int tabListR public static @NonNull Builder builder(@NonNull NPCPoolOptions options) { return builder() .spawnDistance(options.spawnDistance()) - .actionDistance(options.actionDistance()) - .tabListRemoveTicks(options.tabListRemoveTicks()); + .actionDistance(options.actionDistance()); } public static final class Builder { private int spawnDistance = 50; private int actionDistance = 20; - private int tabListRemoveTicks = 30; public @NonNull Builder spawnDistance(int spawnDistance) { this.spawnDistance = spawnDistance; @@ -47,13 +45,8 @@ public static final class Builder { return this; } - public @NonNull Builder tabListRemoveTicks(int tabListRemoveTicks) { - this.tabListRemoveTicks = tabListRemoveTicks; - return this; - } - public @NonNull NPCPoolOptions build() { - return new NPCPoolOptions(this.spawnDistance, this.actionDistance, this.tabListRemoveTicks); + return new NPCPoolOptions(this.spawnDistance, this.actionDistance); } } } diff --git a/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/CloudNetNPCModule.java b/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/CloudNetNPCModule.java index bf3a62c864..a75d234474 100644 --- a/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/CloudNetNPCModule.java +++ b/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/CloudNetNPCModule.java @@ -29,7 +29,6 @@ import eu.cloudnetservice.modules.npc.configuration.InventoryConfiguration; import eu.cloudnetservice.modules.npc.configuration.ItemLayout; import eu.cloudnetservice.modules.npc.configuration.LabyModEmoteConfiguration; -import eu.cloudnetservice.modules.npc.configuration.NPCPoolOptions; import eu.cloudnetservice.modules.npc.impl._deprecated.CloudNPC; import eu.cloudnetservice.modules.npc.impl._deprecated.NPCConstants; import eu.cloudnetservice.modules.npc.impl._deprecated.configuration.NPCConfiguration; @@ -87,11 +86,6 @@ public void convertConfiguration(@NonNull DatabaseProvider databaseProvider) { .collect(Collectors.toMap(Tuple2::_1, Tuple2::_2))) .inventorySize(entry.inventorySize()) .build()) - .npcPoolOptions(NPCPoolOptions.builder() - .tabListRemoveTicks(entry.npcTabListRemoveTicks() > Integer.MAX_VALUE - ? Integer.MAX_VALUE - : (int) entry.npcTabListRemoveTicks()) - .build()) .build()) .collect(Collectors.toSet()); // write the new config diff --git a/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/platform/bukkit/BukkitPlatformNPCManagement.java b/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/platform/bukkit/BukkitPlatformNPCManagement.java index 6de057f4e2..ca12540324 100644 --- a/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/platform/bukkit/BukkitPlatformNPCManagement.java +++ b/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/platform/bukkit/BukkitPlatformNPCManagement.java @@ -108,8 +108,7 @@ public BukkitPlatformNPCManagement( .debug(true) .actionController(builder -> builder .flag(NpcActionController.SPAWN_DISTANCE, entry.npcPoolOptions().spawnDistance()) - .flag(NpcActionController.IMITATE_DISTANCE, entry.npcPoolOptions().actionDistance()) - .flag(NpcActionController.TAB_REMOVAL_TICKS, entry.npcPoolOptions().tabListRemoveTicks())) + .flag(NpcActionController.IMITATE_DISTANCE, entry.npcPoolOptions().actionDistance())) .worldAccessor(BukkitWorldAccessor.nameBasedAccessor()) .packetFactory(this.resolvePacketAdapter()) .build(); From 953a59920cad5cd3d0dbf066356259f92e76ab88 Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Mon, 6 Oct 2025 20:19:59 +0200 Subject: [PATCH 6/7] update downloads --- node/impl/src/main/resources/files/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/impl/src/main/resources/files/versions.json b/node/impl/src/main/resources/files/versions.json index 3334aee440..1b0ba700ab 100644 --- a/node/impl/src/main/resources/files/versions.json +++ b/node/impl/src/main/resources/files/versions.json @@ -488,7 +488,7 @@ "versions": [ { "name": "1.21.9", - "url": "https://files.mcjars.app/spigot/1.21.9/4537/server.jar" + "url": "https://files.mcjars.app/spigot/1.21.9/4539/server.jar" }, { "name": "1.21.8", @@ -803,7 +803,7 @@ "versions": [ { "name": "1.21.9", - "url": "https://files.mcjars.app/loohp-limbo/1.21.9/60/server.jar" + "url": "https://files.mcjars.app/loohp-limbo/1.21.9/61/server.jar" }, { "name": "1.21.8", From f3e1acbda817513134a3f0caeb583657031ef4fe Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Tue, 7 Oct 2025 09:34:16 +0200 Subject: [PATCH 7/7] update protocollib download url to dev-build from github --- .../modules/npc/impl/node/NodeNPCManagement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/NodeNPCManagement.java b/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/NodeNPCManagement.java index 736703cf6a..af839a7e64 100644 --- a/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/NodeNPCManagement.java +++ b/modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/NodeNPCManagement.java @@ -53,7 +53,7 @@ public final class NodeNPCManagement extends AbstractNPCManagement { private static final Path PROTOCOL_LIB_CACHE_PATH = FileUtil.TEMP_DIR.resolve("caches/ProtocolLib.jar"); private static final String PROTOCOL_LIB_DOWNLOAD_URL = System.getProperty( "cloudnet.protocollib.download", - "https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar"); + "https://github.com/dmulloy2/ProtocolLib/releases/download/dev-build/ProtocolLib.jar"); private final Database database; private final Path configurationPath;