Skip to content

Commit 5cc72d5

Browse files
0utplayderklaro
andauthored
feat: minecraft 1.21.5 (#1615)
### Motivation Minecraft 1.21.5 is out and we want to support it. ### Modification Updated versions.json to contain the recent downloads. ProtocolLib is now also using the latest build instead of latest successful build (tests are failing but it is working correctly) ### Result Minecraft 1.21.5 support --------- Co-authored-by: Pasqual Koschmieder <git@derklaro.dev>
1 parent 29ee9ff commit 5cc72d5

5 files changed

Lines changed: 57 additions & 156 deletions

File tree

gradle/libs.versions.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,23 @@ sponge = "9.0.0"
6262
velocity = "3.4.0-SNAPSHOT"
6363
waterdogpe = "1.2.4"
6464
nukkitX = "1.0-SNAPSHOT"
65-
minestom = "ccea53ac44"
65+
minestom = "a1d1920a04"
6666
minestomExtensions = "1.2.0"
6767
spigot = "1.8.8-R0.1-SNAPSHOT"
6868
bungeecord = "1.21-R0.1-SNAPSHOT"
6969
limboloohp = "0.7.9-ALPHA"
7070

7171
# platform extensions
72-
vault = "1.7.1"
7372
adventure = "4.19.0"
7473
modlauncher = "8.1.3"
75-
npcLib = "3.0.0-beta10"
74+
npcLib = "3.0.0-beta12"
7675
packetEvents = "2.7.0"
7776
placeholderApi = "2.11.6"
7877
adventure-serializer-bungee = "4.3.4"
7978
luckPermsApi = "5.4"
8079

8180
# fabric platform special dependencies
82-
minecraft = "1.21.4"
81+
minecraft = "1.21.5"
8382
fabricLoader = "0.16.10"
8483

8584

@@ -186,7 +185,6 @@ adventureSerializerLegacy = { group = "net.kyori", name = "adventure-text-serial
186185
adventureSerializerBungee = { group = "net.kyori", name = "adventure-text-serializer-bungeecord", version.ref = "adventure-serializer-bungee" }
187186

188187
# platform extensions
189-
vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
190188
modLauncher = { group = "cpw.mods", name = "modlauncher", version.ref = "modlauncher" }
191189
bungeecordChat = { group = "net.md-5", name = "bungeecord-chat", version.ref = "bungeecord" }
192190
placeholderApi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderApi" }

modules/bridge/impl/src/main/java/eu/cloudnetservice/modules/bridge/impl/platform/fabric/mixin/handling/MinecraftServerMixin.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,24 @@
4545
@Mixin(MinecraftServer.class)
4646
public abstract class MinecraftServerMixin implements BridgedServer {
4747

48+
@Unique
49+
private FabricInjectionHolder cloudnet_bridge$injectionHolder;
4850
@Unique
4951
private PlatformBridgeManagement<ServerPlayer, NetworkPlayerServerInfo> cloudnet_bridge$management;
52+
5053
@Unique
51-
private FabricInjectionHolder cloudnet_bridge$injectionHolder;
54+
private final Runnable cloudnet_bridge$postInitTickableTask = this::cloudnet_bridge$postInitTickable;
5255

5356
@Shadow
5457
public abstract PlayerList getPlayerList();
5558

5659
@Shadow
5760
public abstract String getMotd();
5861

59-
@Shadow
6062
@Final
63+
@Shadow
6164
private List<Runnable> tickables;
6265

63-
private final Runnable cloudnet_bridge$postInitTickableTask = this::cloudnet_bridge$postInitTickable;
64-
6566
@Inject(
6667
at = @At(
6768
value = "INVOKE",
@@ -70,9 +71,7 @@ public abstract class MinecraftServerMixin implements BridgedServer {
7071
method = "runServer"
7172
)
7273
public void cloudnet_bridge$beforeTickLoopStart(CallbackInfo callbackInfo) {
73-
// the server now booted completely
7474
this.cloudnet_bridge$injectionHolder = InjectionLayer.ext().instance(FabricInjectionHolder.class);
75-
// we have to create the management ourselves as we can't inject the server
7675
this.cloudnet_bridge$management = new FabricBridgeManagement(
7776
this,
7877
this.cloudnet_bridge$injectionHolder.rpcFactory(),

modules/npcs/impl/src/main/java/eu/cloudnetservice/modules/npc/impl/node/NodeNPCManagement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public final class NodeNPCManagement extends AbstractNPCManagement {
5454
private static final Path PROTOCOL_LIB_CACHE_PATH = FileUtil.TEMP_DIR.resolve("caches/ProtocolLib.jar");
5555
private static final String PROTOCOL_LIB_DOWNLOAD_URL = System.getProperty(
5656
"cloudnet.protocollib.download",
57-
"https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar");
57+
"https://ci.dmulloy2.net/job/ProtocolLib/lastBuild/artifact/build/libs/ProtocolLib.jar");
5858

5959
private final Database database;
6060
private final Path configurationPath;

modules/signs/impl/src/main/java/eu/cloudnetservice/modules/signs/impl/platform/minestom/MinestomSignBlockHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import java.util.Collection;
2020
import java.util.List;
2121
import lombok.NonNull;
22+
import net.kyori.adventure.key.Key;
2223
import net.minestom.server.instance.block.BlockHandler;
2324
import net.minestom.server.tag.Tag;
24-
import net.minestom.server.utils.NamespaceID;
2525

2626
final class MinestomSignBlockHandler implements BlockHandler {
2727

@@ -34,7 +34,7 @@ final class MinestomSignBlockHandler implements BlockHandler {
3434
Tag.String("Text3"),
3535
Tag.String("Text4"));
3636

37-
private static final NamespaceID SIGN_NAMESPACE = NamespaceID.from("minecraft:sign");
37+
private static final Key SIGN_NAMESPACE = Key.key("minecraft", "sign");
3838

3939
private MinestomSignBlockHandler() {
4040
}
@@ -45,7 +45,7 @@ private MinestomSignBlockHandler() {
4545
}
4646

4747
@Override
48-
public @NonNull NamespaceID getNamespaceId() {
48+
public @NonNull Key getKey() {
4949
return SIGN_NAMESPACE;
5050
}
5151
}

0 commit comments

Comments
 (0)