Update to 1.21

Author: henkelmax

changelog.md

@@ -1 +1 @@
-- Updated to 1.20.6
+- Updated to 1.21

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.daemon=false
 java_version=21
 
 mod_loader=fabric
-minecraft_version=1.20.6
-minecraft_dependency=1.20.6
-fabric_loader_version=0.15.10
-fabric_loader_dependency=>=0.15.10
-fabric_api_version=0.97.8+1.20.6
-fabric_api_dependency_breaks=<0.97.8+1.20.6
+minecraft_version=1.21
+minecraft_dependency=1.21
+fabric_loader_version=0.15.11
+fabric_loader_dependency=>=0.15.11
+fabric_api_version=0.100.1+1.21
+fabric_api_dependency_breaks=<0.100.1+1.21
 
 mod_compatibility_version=1
 
 # Mod information
-mod_version=1.20.6-1.0.6
+mod_version=1.21-1.0.6
 mod_id=status
 mod_display_name=Status
 

src/main/java/de/maxhenkel/status/Status.java

@@ -30,7 +30,7 @@ public class Status implements ModInitializer {
     public static ServerConfig SERVER_CONFIG;
     public static PlayerStateManager STATE_MANAGER;
 
-    public static final ResourceLocation INIT = new ResourceLocation(Status.MODID, "init");
+    public static final ResourceLocation INIT = ResourceLocation.fromNamespaceAndPath(Status.MODID, "init");
     public static int COMPATIBILITY_VERSION = -1;
 
     @Override
@@ -51,7 +51,7 @@ public void onInitialize() {
         ServerLifecycleEvents.SERVER_STARTING.register(server -> {
             SERVER_CONFIG = ConfigBuilder
                     .builder(ServerConfig::new)
-                    .path(server.getServerDirectory().toPath().resolve("config").resolve(MODID).resolve("status-server.properties"))
+                    .path(server.getServerDirectory().resolve("config").resolve(MODID).resolve("status-server.properties"))
                     .build();
         });
 

src/main/java/de/maxhenkel/status/gui/StatusScreen.java

@@ -11,14 +11,14 @@
 
 public class StatusScreen extends StatusScreenBase {
 
-    private static final ResourceLocation TEXTURE = new ResourceLocation(Status.MODID, "textures/gui/gui_status.png");
-    private static final ResourceLocation OUTLINE = new ResourceLocation(Status.MODID, "textures/icons/outline.png");
-    private static final ResourceLocation NO_AVAILABILITY = new ResourceLocation(Status.MODID, "textures/icons/no_availability.png");
-    private static final ResourceLocation DND = new ResourceLocation(Status.MODID, "textures/icons/dnd.png");
-    private static final ResourceLocation OPEN = new ResourceLocation(Status.MODID, "textures/icons/open.png");
-    private static final ResourceLocation NEUTRAL = new ResourceLocation(Status.MODID, "textures/icons/neutral.png");
-    private static final ResourceLocation RECORDING = new ResourceLocation(Status.MODID, "textures/icons/recording.png");
-    private static final ResourceLocation STREAMING = new ResourceLocation(Status.MODID, "textures/icons/streaming.png");
+    private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/gui/gui_status.png");
+    private static final ResourceLocation OUTLINE = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/outline.png");
+    private static final ResourceLocation NO_AVAILABILITY = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/no_availability.png");
+    private static final ResourceLocation DND = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/dnd.png");
+    private static final ResourceLocation OPEN = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/open.png");
+    private static final ResourceLocation NEUTRAL = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/neutral.png");
+    private static final ResourceLocation RECORDING = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/recording.png");
+    private static final ResourceLocation STREAMING = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/streaming.png");
 
     public StatusScreen() {
         super(Component.translatable("gui.status.title"), 145, 184);

src/main/java/de/maxhenkel/status/net/PlayerStatePacket.java

@@ -9,7 +9,7 @@
 
 public class PlayerStatePacket implements Packet<PlayerStatePacket> {
 
-    public static final Type<PlayerStatePacket> PLAYER_STATE = new CustomPacketPayload.Type<>(new ResourceLocation(Status.MODID, "state"));
+    public static final Type<PlayerStatePacket> PLAYER_STATE = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(Status.MODID, "state"));
 
     public static final StreamCodec<RegistryFriendlyByteBuf, PlayerStatePacket> CODEC = new StreamCodec<>() {
         @Override

src/main/java/de/maxhenkel/status/net/PlayerStatesPacket.java

@@ -13,7 +13,7 @@
 
 public class PlayerStatesPacket implements Packet<PlayerStatesPacket> {
 
-    public static final Type<PlayerStatesPacket> PLAYER_STATES = new CustomPacketPayload.Type<>(new ResourceLocation(Status.MODID, "states"));
+    public static final Type<PlayerStatesPacket> PLAYER_STATES = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(Status.MODID, "states"));
 
     public static final StreamCodec<RegistryFriendlyByteBuf, PlayerStatesPacket> CODEC = new StreamCodec<>() {
         @Override

src/main/java/de/maxhenkel/status/playerstate/ClientPlayerStateManager.java

@@ -116,12 +116,12 @@ public PlayerState getState(UUID player) {
         return states.get(player);
     }
 
-    private static final ResourceLocation DND = new ResourceLocation(Status.MODID, "textures/icons/dnd.png");
-    private static final ResourceLocation OPEN = new ResourceLocation(Status.MODID, "textures/icons/open.png");
-    private static final ResourceLocation NO_AVAILABILITY = new ResourceLocation(Status.MODID, "textures/icons/no_availability.png");
-    private static final ResourceLocation RECORDING = new ResourceLocation(Status.MODID, "textures/icons/recording.png");
-    private static final ResourceLocation STREAMING = new ResourceLocation(Status.MODID, "textures/icons/streaming.png");
-    private static final ResourceLocation NEUTRAL = new ResourceLocation(Status.MODID, "textures/icons/neutral.png");
+    private static final ResourceLocation DND = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/dnd.png");
+    private static final ResourceLocation OPEN = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/open.png");
+    private static final ResourceLocation NO_AVAILABILITY = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/no_availability.png");
+    private static final ResourceLocation RECORDING = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/recording.png");
+    private static final ResourceLocation STREAMING = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/streaming.png");
+    private static final ResourceLocation NEUTRAL = ResourceLocation.fromNamespaceAndPath(Status.MODID, "textures/icons/neutral.png");
 
     @Nullable
     public ResourceLocation getIcon(UUID player) {