diff --git a/README.md b/README.md
index ae471f209..279d413ed 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ Maven
maven.modrinth
pl3xmap
- 1.20.6-493
+ 1.21-500
provided
```
@@ -101,7 +101,7 @@ repositories {
}
dependencies {
- compileOnly 'maven.modrinth:pl3xmap:1.20.6-493'
+ compileOnly 'maven.modrinth:pl3xmap:1.21-500'
}
```
diff --git a/bukkit/src/main/java/net/pl3x/map/bukkit/Pl3xMapImpl.java b/bukkit/src/main/java/net/pl3x/map/bukkit/Pl3xMapImpl.java
index 7fda1684b..2679fd4f5 100644
--- a/bukkit/src/main/java/net/pl3x/map/bukkit/Pl3xMapImpl.java
+++ b/bukkit/src/main/java/net/pl3x/map/bukkit/Pl3xMapImpl.java
@@ -154,7 +154,7 @@ public int getColorForPower(byte power) {
@Override
public net.pl3x.map.core.world.@Nullable Block getFlower(@NotNull World world, net.pl3x.map.core.world.@NotNull Biome biome, int blockX, int blockY, int blockZ) {
// https://github.com/Draradech/FlowerMap (CC0-1.0 license)
- Biome nms = world.getLevel().registryAccess().registryOrThrow(Registries.BIOME).get(new ResourceLocation(biome.getKey()));
+ Biome nms = world.getLevel().registryAccess().registryOrThrow(Registries.BIOME).get(ResourceLocation.parse(biome.getKey()));
if (nms == null) {
return null;
}
diff --git a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundMapPayload.java b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundMapPayload.java
index cd72c754c..76c037b75 100644
--- a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundMapPayload.java
+++ b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundMapPayload.java
@@ -8,7 +8,7 @@
public record ClientboundMapPayload(int protocol, int response, int mapId, byte scale, int centerX, int centerZ, String worldName) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ClientboundMapPayload::write, ClientboundMapPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "client_map_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "client_map_data"));
public ClientboundMapPayload(int protocol, int response, int mapId) {
this(protocol, response, mapId, (byte) 0, 0, 0, null);
diff --git a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundServerPayload.java b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundServerPayload.java
index bcc4df553..1ede9a97a 100644
--- a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundServerPayload.java
+++ b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ClientboundServerPayload.java
@@ -8,7 +8,7 @@
public record ClientboundServerPayload(int protocol, int response, String webAddress) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ClientboundServerPayload::write, ClientboundServerPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "client_server_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "client_server_data"));
public ClientboundServerPayload(int protocol, int response) {
this(protocol, response, null);
diff --git a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundMapPayload.java b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundMapPayload.java
index 1b5d87511..be6d45ecc 100644
--- a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundMapPayload.java
+++ b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundMapPayload.java
@@ -8,7 +8,7 @@
public record ServerboundMapPayload(int protocol, int mapId) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ServerboundMapPayload::write, ServerboundMapPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "server_map_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "server_map_data"));
public ServerboundMapPayload(int mapId) {
this(Constants.PROTOCOL, mapId);
diff --git a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundServerPayload.java b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundServerPayload.java
index 0601dd640..f02935092 100644
--- a/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundServerPayload.java
+++ b/bukkit/src/main/java/net/pl3x/map/bukkit/network/ServerboundServerPayload.java
@@ -8,7 +8,7 @@
public record ServerboundServerPayload(int protocol) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ServerboundServerPayload::write, ServerboundServerPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "server_server_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "server_server_data"));
public ServerboundServerPayload(FriendlyByteBuf friendlyByteBuf) {
this(friendlyByteBuf.readInt());
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/client/manager/NetworkManager.java b/fabric/src/main/java/net/pl3x/map/fabric/client/manager/NetworkManager.java
index 09ef9a2a3..05d455b56 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/client/manager/NetworkManager.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/client/manager/NetworkManager.java
@@ -36,7 +36,7 @@
import org.jetbrains.annotations.NotNull;
public class NetworkManager {
- private final ResourceLocation channel = new ResourceLocation(Constants.MODID, Constants.MODID);
+ private final ResourceLocation channel = ResourceLocation.fromNamespaceAndPath(Constants.MODID, Constants.MODID);
private final Pl3xMapFabricClient mod;
public NetworkManager(@NotNull Pl3xMapFabricClient mod) {
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundMapPayload.java b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundMapPayload.java
index 452136eb8..36c0d3e5a 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundMapPayload.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundMapPayload.java
@@ -12,7 +12,7 @@
public record ClientboundMapPayload(int protocol, int response, int mapId, byte scale, int centerX, int centerZ, String worldName) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ClientboundMapPayload::write, ClientboundMapPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "client_map_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "client_map_data"));
public ClientboundMapPayload(int protocol, int response, int mapId) {
this(protocol, response, mapId, (byte) 0, 0, 0, null);
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundServerPayload.java b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundServerPayload.java
index 950803bb6..6f820db5d 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundServerPayload.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ClientboundServerPayload.java
@@ -10,7 +10,7 @@
public record ClientboundServerPayload(int protocol, int response, String webAddress) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ClientboundServerPayload::write, ClientboundServerPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "client_server_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "client_server_data"));
public ClientboundServerPayload(int protocol, int response) {
this(protocol, response, null);
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundMapPayload.java b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundMapPayload.java
index 888367134..bcff4a678 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundMapPayload.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundMapPayload.java
@@ -8,7 +8,7 @@
public record ServerboundMapPayload(int protocol, int mapId) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ServerboundMapPayload::write, ServerboundMapPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "server_map_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "server_map_data"));
public ServerboundMapPayload(int mapId) {
this(Constants.PROTOCOL, mapId);
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundServerPayload.java b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundServerPayload.java
index c1ea5bf2c..8739b42e1 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundServerPayload.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/common/network/ServerboundServerPayload.java
@@ -8,7 +8,7 @@
public record ServerboundServerPayload(int protocol) implements CustomPacketPayload {
public static final StreamCodec STREAM_CODEC = CustomPacketPayload.codec(ServerboundServerPayload::write, ServerboundServerPayload::new);
- public static final Type TYPE = new Type<>(new ResourceLocation(Constants.MODID, "server_server_data"));
+ public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(Constants.MODID, "server_server_data"));
public ServerboundServerPayload(FriendlyByteBuf friendlyByteBuf) {
this(friendlyByteBuf.readInt());
diff --git a/fabric/src/main/java/net/pl3x/map/fabric/server/Pl3xMapFabricServer.java b/fabric/src/main/java/net/pl3x/map/fabric/server/Pl3xMapFabricServer.java
index dc67b2d1c..32511ef94 100644
--- a/fabric/src/main/java/net/pl3x/map/fabric/server/Pl3xMapFabricServer.java
+++ b/fabric/src/main/java/net/pl3x/map/fabric/server/Pl3xMapFabricServer.java
@@ -212,7 +212,7 @@ public int getColorForPower(byte power) {
@Override
public net.pl3x.map.core.world.@Nullable Block getFlower(@NotNull World world, net.pl3x.map.core.world.@NotNull Biome biome, int blockX, int blockY, int blockZ) {
// https://github.com/Draradech/FlowerMap (CC0-1.0 license)
- Biome nms = world.getLevel().registryAccess().registryOrThrow(Registries.BIOME).get(new ResourceLocation(biome.getKey()));
+ Biome nms = world.getLevel().registryAccess().registryOrThrow(Registries.BIOME).get(ResourceLocation.parse(biome.getKey()));
if (nms == null) {
return null;
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7a9f16b0f..d8f661785 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
[versions]
-bukkit="1.20.6-R0.1-SNAPSHOT"
+bukkit="1.21-R0.1-SNAPSHOT"
-fabricApi="0.97.8+1.20.6"
-fabricLoader="0.15.10"
+fabricApi="0.100.1+1.21"
+fabricLoader="0.15.11"
fabricLoom="1.6-SNAPSHOT"
forge="1.20.2-48.0.6"
forgeGradle="[6.0,6.2)"
forgeLoader="[48,)"
-minecraft="1.20.6"
+minecraft="1.21"
minotaur="2.+"
paperweight="1.7.1"
indra-git="2.1.1"
shadowJar="8.1.7"
-adventure="4.17.0-SNAPSHOT"
+adventure="4.18.0-SNAPSHOT"
adventureBukkit="4.3.3-SNAPSHOT"
-adventureFabric="5.13.1-SNAPSHOT"
+adventureFabric="5.14.0-SNAPSHOT"
caffeine="3.1.8"
cloud="2.0.0-SNAPSHOT"