From b72b6c71795019a0f8a89b69a35563b9c98a897f Mon Sep 17 00:00:00 2001
From: Minecon724 <minecon724@noreply.git.m724.eu>
Date: Fri, 17 Oct 2025 20:48:21 +0200
Subject: [PATCH] Update to 1.21.8

---
 .forgejo/workflows/build.yml                  | 12 ++-----
 .idea/workspace.xml                           | 30 +++++++++++-----
 README.md                                     |  2 +-
 docs/BUILDING.md                              | 35 +++++++++----------
 pom.xml                                       | 16 ++++-----
 .../m724/tweaks/module/chat/ChatListener.java |  9 ++---
 .../m724/tweaks/module/motd/MotdModule.java   |  7 ++--
 .../tweaks/module/sleep/SleepListener.java    |  2 +-
 .../m724/tweaks/module/swing/SwingModule.java |  2 +-
 .../worldborder/WorldBorderExpandModule.java  |  2 +-
 tools/download_nms.sh                         |  6 ++--
 11 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index e62a601..8f20cb4 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -13,20 +13,12 @@ jobs:
       - name: Download NMS
         run: ./tools/download_nms.sh ~
 
-      - name: Build for 1.21.5
-        run: ./mvnw package -Dproject.minecraft.version=1.21.5 -Dproject.craftbukkit.version=v1_21_R4
+      - name: Build for 1.21.8
+        run: ./mvnw package -Dproject.minecraft.version=1.21.8 -Dproject.craftbukkit.version=v1_21_R5
 
       - name: Build for 1.21.4
         run: ./mvnw package -Dproject.minecraft.version=1.21.4 -Dproject.craftbukkit.version=v1_21_R3
 
-      - name: Build for 1.21.3
-        run: ./mvnw package -Dproject.minecraft.version=1.21.3 -Dproject.craftbukkit.version=v1_21_R2
-
-      - name: Build for 1.21.1
-        run: ./mvnw package -Dproject.minecraft.version=1.21.1 -Dproject.craftbukkit.version=v1_21_R1
-
-
-
       - name: Upload artifacts
         uses: https://github.com/actions/upload-artifact@v3
         with:
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d62e14d..49644e3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b6c6d76f-f438-4423-a70b-1459280aa431" name="Changes" comment="Update IDEA files" />
+    <list default="true" id="b6c6d76f-f438-4423-a70b-1459280aa431" name="Changes" comment="Update IDEA files">
+      <change beforePath="$PROJECT_DIR$/.forgejo/workflows/build.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.forgejo/workflows/build.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/BUILDING.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/BUILDING.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/chat/ChatListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/chat/ChatListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/motd/MotdModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/motd/MotdModule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/sleep/SleepListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/sleep/SleepListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/swing/SwingModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/swing/SwingModule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/worldborder/WorldBorderExpandModule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/eu/m724/tweaks/module/worldborder/WorldBorderExpandModule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tools/download_nms.sh" beforeDir="false" afterPath="$PROJECT_DIR$/tools/download_nms.sh" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -29,14 +40,17 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "master",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/home/user/.m2/repository/org/spigotmc/spigot/1.21.8-R0.1-SNAPSHOT/spigot-1.21.8-R0.1-SNAPSHOT-remapped-mojang.jar"
   }
-}</component>
+}]]></component>
   <component name="RunManager">
     <configuration default="true" type="JetRunConfigurationType">
       <module name="mutils" />
diff --git a/README.md b/README.md
index f73600d..8535f2f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Please report all suspicious behavior. You can do so on any of those:
 Stuff no<sub><sup>t many</sup></sub> other plugins do.
 
 Dependencies:
-- **1.21.1 and newer**
+- **1.21.4 or 1.21.8**
 - [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/)
 - To use modules marked <sup><sub>N</sub></sup>, you must use a JAR [made for the exact server version.](docs/BUILDING.md)
 
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index 7af000f..cb47f29 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -1,32 +1,31 @@
-First, download NMS. There are two ways:
+First, download NMS:
 
-- Use `tools/download_nms.sh`
-- Download BuildTools, move it into an empty directory and run:
+- Download [BuildTools](https://www.spigotmc.org/wiki/buildtools/), move it into an empty directory and run:
+  ```bash
+  java -jar BuildTools.jar --remapped --rev 1.21.8
   ```
-  java -jar BuildTools.jar --rev 1.21.4 --remapped
-  ```
-  You must run this for every version you want to build for.
+  - Replace 1.21.8 of course
+  - Do this for every Minecraft version you want to build for
+  - You only need to do this once per Minecraft version
 
 
 
 Then build the plugin:
 
 1. Clone this repository:
-   ```
+   ```bash
    git clone https://git.m724.eu/Minecon724/tweaks724
    cd tweaks724
    ```
-   - You might want to `checkout` a release:
+   - You might want to target a release:
+     ```bash
+     git checkout tags/tweaks-0.1.15
      ```
-     git checkout tags/tweaks-0.1.12
-     ```
-2. For the "native" version:
-   ```
-   ./mvnw package
-   ```
-   For another compatible version:
-   ```
-   ./mvnw package -Dproject.craftbukkit.version=v1_21_R3 -Dproject.minecraft.version=1.21.4
+2. Build:
+   ```bash
+   ./mvnw package -Dproject.craftbukkit.version=v1_21_R5 -Dproject.minecraft.version=1.21.8
    ```
+   - `project.craftbukkit.version` is the NMS version, [to find here](https://www.spigotmc.org/wiki/spigot-nms-and-minecraft-versions-1-21/).
+   - `project.minecraft.version` is the Minecraft version.
    
-Look for `tweaks-0.1.12+1.21.4.jar` in `target/`
\ No newline at end of file
+Look for `tweaks-0.1.15+1.21.8.jar` in `target/`
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4dd9026..0d8afd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,8 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <project.craftbukkit.version>v1_21_R4</project.craftbukkit.version>
-        <project.minecraft.version>1.21.5</project.minecraft.version>
+        <project.craftbukkit.version>v1_21_R5</project.craftbukkit.version>
+        <project.minecraft.version>1.21.8</project.minecraft.version>
         <project.spigot.version>${project.minecraft.version}-R0.1-SNAPSHOT</project.spigot.version>
     </properties>
 
@@ -44,7 +44,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <replace token="v1_21_R4" value="${project.craftbukkit.version}" dir="src/main">
+                                <replace token="v1_21_R5" value="${project.craftbukkit.version}" dir="src/main">
                                     <include name="**/*.java" />
                                 </replace>
                             </target>
@@ -58,7 +58,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <replace token="${project.craftbukkit.version}" value="v1_21_R4" dir="src/main">
+                                <replace token="${project.craftbukkit.version}" value="v1_21_R5" dir="src/main">
                                     <include name="**/*.java" />
                                 </replace>
                             </target>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21.1-R0.1-SNAPSHOT</version> <!-- oldest supported version -->
+            <version>1.21.4-R0.1-SNAPSHOT</version> <!-- oldest supported version -->
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -139,9 +139,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.comphenix.protocol</groupId>
+            <groupId>net.dmulloy2</groupId>
             <artifactId>ProtocolLib</artifactId>
-            <version>5.3.0</version>
+            <version>5.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -153,7 +153,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.1.0</version>
+            <version>26.0.2-1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/eu/m724/tweaks/module/chat/ChatListener.java b/src/main/java/eu/m724/tweaks/module/chat/ChatListener.java
index 5b80556..65d9af9 100644
--- a/src/main/java/eu/m724/tweaks/module/chat/ChatListener.java
+++ b/src/main/java/eu/m724/tweaks/module/chat/ChatListener.java
@@ -6,6 +6,7 @@
 
 package eu.m724.tweaks.module.chat;
 
+import com.mojang.serialization.JsonOps;
 import eu.m724.tweaks.config.TweaksConfig;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -13,9 +14,8 @@ import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.chat.TranslatableComponent;
 import net.md_5.bungee.chat.ComponentSerializer;
-import net.minecraft.network.chat.Component;
-import org.bukkit.craftbukkit.v1_21_R4.CraftRegistry;
-import org.bukkit.craftbukkit.v1_21_R4.entity.CraftPlayer;
+import net.minecraft.network.chat.ComponentSerialization;
+import org.bukkit.craftbukkit.v1_21_R5.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -107,7 +107,8 @@ public class ChatListener implements Listener {
             ChatRoom chatRoom = chatModule.getPlayerChatRoom(player);
 
             // would be easier on Paper but this is not Paper
-            BaseComponent deathMessage = ComponentSerializer.deserialize(Component.Serializer.toJson(((CraftPlayer)player).getHandle().getCombatTracker().getDeathMessage(), CraftRegistry.getMinecraftRegistry()));
+
+            BaseComponent deathMessage = ComponentSerializer.deserialize(ComponentSerialization.CODEC.encodeStart(JsonOps.INSTANCE, ((CraftPlayer)player).getHandle().getCombatTracker().getDeathMessage()).getOrThrow());
 
             // TODO make players ChatFormatUtils
 
diff --git a/src/main/java/eu/m724/tweaks/module/motd/MotdModule.java b/src/main/java/eu/m724/tweaks/module/motd/MotdModule.java
index 63f1b6c..c7e3b99 100644
--- a/src/main/java/eu/m724/tweaks/module/motd/MotdModule.java
+++ b/src/main/java/eu/m724/tweaks/module/motd/MotdModule.java
@@ -13,6 +13,7 @@ import com.comphenix.protocol.reflect.StructureModifier;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
+import com.mojang.serialization.JsonOps;
 import eu.m724.tweaks.DebugLogger;
 import eu.m724.tweaks.module.TweaksModule;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -20,7 +21,9 @@ import net.md_5.bungee.chat.ComponentSerializer;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.network.protocol.status.ServerStatus;
+import org.bukkit.craftbukkit.v1_21_R5.entity.CraftPlayer;
 
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
@@ -76,7 +79,7 @@ public class MotdModule extends TweaksModule {
                         json = ComponentSerializer.toJson(TextComponent.fromLegacy(entry));
                     }
 
-                    return Component.Serializer.fromJson(json, RegistryAccess.EMPTY);
+                    return ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, json).getOrThrow();
                 })
                 .toArray(Component[]::new);
 
@@ -95,7 +98,7 @@ public class MotdModule extends TweaksModule {
                     motd,
                     Optional.empty(),
                     Optional.of(new ServerStatus.Version(
-                            SharedConstants.getCurrentVersion().getName(),
+                            SharedConstants.getCurrentVersion().name(),
                             SharedConstants.getProtocolVersion()
                     )),
                     serverStatus.favicon(),
diff --git a/src/main/java/eu/m724/tweaks/module/sleep/SleepListener.java b/src/main/java/eu/m724/tweaks/module/sleep/SleepListener.java
index b1d0f85..db483ed 100644
--- a/src/main/java/eu/m724/tweaks/module/sleep/SleepListener.java
+++ b/src/main/java/eu/m724/tweaks/module/sleep/SleepListener.java
@@ -44,7 +44,7 @@ public class SleepListener implements Listener {
                     world.setTime(Math.min(world.getTime() + (long) (10917 * onePlayerRatio), 23459));
                 }
 
-                var maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue();
+                var maxHealth = player.getAttribute(Attribute.MAX_HEALTH).getBaseValue();
                 player.setHealth(Math.min(player.getHealth() + heal, maxHealth));
             }
         }
diff --git a/src/main/java/eu/m724/tweaks/module/swing/SwingModule.java b/src/main/java/eu/m724/tweaks/module/swing/SwingModule.java
index 392c13f..2e97172 100644
--- a/src/main/java/eu/m724/tweaks/module/swing/SwingModule.java
+++ b/src/main/java/eu/m724/tweaks/module/swing/SwingModule.java
@@ -47,7 +47,7 @@ public class SwingModule extends TweaksModule implements Listener {
             var result = player.getWorld().rayTraceEntities(
                     player.getEyeLocation(),
                     player.getEyeLocation().getDirection(),
-                    player.getAttribute(Attribute.PLAYER_ENTITY_INTERACTION_RANGE).getValue(),
+                    player.getAttribute(Attribute.ENTITY_INTERACTION_RANGE).getValue(),
                     e -> e != player
             );
 
diff --git a/src/main/java/eu/m724/tweaks/module/worldborder/WorldBorderExpandModule.java b/src/main/java/eu/m724/tweaks/module/worldborder/WorldBorderExpandModule.java
index acf14b2..11ac275 100644
--- a/src/main/java/eu/m724/tweaks/module/worldborder/WorldBorderExpandModule.java
+++ b/src/main/java/eu/m724/tweaks/module/worldborder/WorldBorderExpandModule.java
@@ -8,7 +8,7 @@ package eu.m724.tweaks.module.worldborder;
 
 import eu.m724.tweaks.module.TweaksModule;
 import net.minecraft.server.level.ServerLevel;
-import org.bukkit.craftbukkit.v1_21_R4.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldLoadEvent;
diff --git a/tools/download_nms.sh b/tools/download_nms.sh
index 87a2bf7..b670936 100755
--- a/tools/download_nms.sh
+++ b/tools/download_nms.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-FILENAME=nms_1_21_1+3+4+5.tar.zst
-CHECKSUM=0ea6267ce39213ddb0d6a7669d8021283350bb56de0d65f2e9fddd3c85337c5fbd204272b07c7e8532c6eaef46c3a47a39bac183abd6f4cfa7b171e08b4d7029
+FILENAME=nms_1_21_4+8.tar.zst
+CHECKSUM=4be5f102a9d83ca03e1d45f7471845e5826b84880f9d3aa18d54507be7288bc9d5acb7d9b5e32829a9694e89dbef62bd8a3ae5d71c1b82d77328fe48aaaccbfa
 
-curl -O https://36ab09b1.m724.eu/$FILENAME
+curl -O https://q.litter.m724.eu/$FILENAME
 if [ "$(sha512sum $FILENAME)" = "$CHECKSUM  $FILENAME" ]; then
   tar -xaf $FILENAME -C "$1"
   rm $FILENAME