diff --git a/.github/workflows/ci_master.yml b/.github/workflows/ci_master.yml index 37cda4dd..d76b095f 100644 --- a/.github/workflows/ci_master.yml +++ b/.github/workflows/ci_master.yml @@ -14,7 +14,7 @@ permissions: jobs: build: - name: 'Build - 1.21.3' + name: 'Build - 1.21.4' runs-on: ubuntu-latest steps: - name: 'Setup JDK 21 📦' @@ -28,7 +28,7 @@ jobs: gradle-version: '8.8' - name: 'Checkout for CI 🛎️' uses: actions/checkout@v4 - - name: '[Current - 1.21.3] Build 🛎️' + - name: '[Current - 1.21.4] Build 🛎️' run: | ./gradlew clean build publish env: @@ -55,14 +55,14 @@ jobs: version: ${{ env.version_name }} changelog: ${{ github.event.head_commit.message }} distro-names: | - paper-1.21.3 - fabric-1.21.3 + paper-1.21.4 + fabric-1.21.4 distro-groups: | paper fabric distro-descriptions: | - Paper 1.21.3 - Fabric 1.21.3 + Paper 1.21.4 + Fabric 1.21.4 files: | - target/HuskSync-Paper-${{ env.version_name }}+mc.1.21.3.jar - target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.3.jar \ No newline at end of file + target/HuskSync-Paper-${{ env.version_name }}+mc.1.21.4.jar + target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.4.jar \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b60fcac7..5bc9333b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,10 +23,10 @@ jobs: uses: gradle/actions/setup-gradle@v4 with: gradle-version: '8.8' - - name: '[Current - 1.21.3] Checkout for CI 🛎️' + - name: '[Current - 1.21.4] Checkout for CI 🛎️' uses: actions/checkout@v4 with: - path: '1_21_3' + path: '1_21_4' - name: '[Non-LTS - 1.21.1] Checkout for CI 🛎️' uses: actions/checkout@v4 with: @@ -37,10 +37,10 @@ jobs: with: ref: 'minecraft/1.20.1' path: '1_20_1' - - name: '[Current - 1.21.3] Build 🛎️' + - name: '[Current - 1.21.4] Build 🛎️' run: | mkdir target - cd 1_21_3 + cd 1_21_4 ./gradlew clean build publish -Dforce-hide-version-meta=1 cp -rf target/* ../target/ cd .. @@ -79,8 +79,8 @@ jobs: version: ${{ github.event.release.tag_name }} changelog: ${{ github.event.release.body }} distro-names: | - paper-1.21.3 - fabric-1.21.3 + paper-1.21.4 + fabric-1.21.4 paper-1.21.1 fabric-1.21.1 paper-1.20.1 @@ -93,15 +93,15 @@ jobs: paper fabric distro-descriptions: | - Paper 1.21.3 - Fabric 1.21.3 + Paper 1.21.4 + Fabric 1.21.4 Paper 1.21.1 Fabric 1.21.1 Paper 1.20.1 Fabric 1.20.1 files: | - target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.21.3.jar - target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar + target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.21.4.jar + target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.4.jar target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.21.1.jar target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.20.1.jar diff --git a/README.md b/README.md index fefff7cb..467d052e 100644 --- a/README.md +++ b/README.md @@ -46,15 +46,16 @@ ## Compatibility HuskSync supports the following [compatible versions](https://william278.net/docs/husksync/compatibility) of Minecraft. Since v3.7, you must download the correct version of HuskSync for your server: -| Minecraft | Latest HuskSync | Java Version | Platforms | Support Ends | -|:---------------:|:---------------:|:------------:|:--------------|:------------------------------| -| 1.21.3 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** | -| 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **December 2024** (Non-LTS) | -| 1.20.6 | 3.6.8 | 17 | Paper | ❌ _October 2024_ | -| 1.20.4 | 3.6.8 | 17 | Paper | ❌ _July 2024_ | -| 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) | -| 1.17.1 - 1.19.4 | 3.6.8 | 17 | Paper | ❌ _Support ended_ | -| 1.16.5 | 3.2.1 | 16 | Paper | ❌ _Support ended_ | +| Minecraft | Latest HuskSync | Java Version | Platforms | Support Status | +|:---------------:|:---------------:|:------------:|:--------------|:-----------------------------| +| 1.21.4 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** | +| 1.21.3 | 3.7.1 | 21 | Paper, Fabric | 🗃️ Archived (December 2024) | +| 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **November 2024** (LTS) | +| 1.20.6 | 3.6.8 | 17 | Paper | 🗃️ Archived (October 2024) | +| 1.20.4 | 3.6.8 | 17 | Paper | 🗃️ Archived (July 2024) | +| 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) | +| 1.17.1 - 1.19.4 | 3.6.8 | 17 | Paper | 🗃️ Archived | +| 1.16.5 | 3.2.1 | 16 | Paper | 🗃️ Archived | HuskSync is primarily developed against the latest release. Old Minecraft versions are allocated a support channel based on popularity, mod support, etc: diff --git a/bukkit/build.gradle b/bukkit/build.gradle index f69f260d..5e0f6339 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation 'net.kyori:adventure-platform-bukkit:4.3.4' implementation 'dev.triumphteam:triumph-gui:3.1.10' implementation 'space.arim.morepaperlib:morepaperlib:0.4.4' - implementation 'de.tr7zw:item-nbt-api:2.14.0' + implementation 'de.tr7zw:item-nbt-api:2.14.1-SNAPSHOT' compileOnly "org.spigotmc:spigot-api:${bukkit_spigot_api}" compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0' diff --git a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java index 2beaed0d..b32c1cb3 100644 --- a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java +++ b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java @@ -344,6 +344,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S case "1.20.5", "1.20.6" -> DataFixerUtil.VERSION1_20_5; case "1.21", "1.21.1" -> DataFixerUtil.VERSION1_21; case "1.21.2", "1.21.3" -> DataFixerUtil.VERSION1_21_2; + case "1.21.4" -> 4189/*DataFixerUtil.VERSION1_21_4*/; default -> DataFixerUtil.getCurrentVersion(); }; } diff --git a/docs/Compatibility.md b/docs/Compatibility.md index 74fe7128..cbff3e63 100644 --- a/docs/Compatibility.md +++ b/docs/Compatibility.md @@ -1,14 +1,15 @@ HuskSync supports the following versions of Minecraft. Since v3.7, you must download the correct version of HuskSync for your server: -| Minecraft | Latest HuskSync | Java Version | Platforms | Support Ends | -|:---------------:|:---------------:|:------------:|:--------------|:------------------------------| -| 1.21.3 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** | -| 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **December 2024** (Non-LTS) | -| 1.20.6 | 3.6.8 | 17 | Paper | ❌ _October 2024_ | -| 1.20.4 | 3.6.8 | 17 | Paper | ❌ _July 2024_ | -| 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) | -| 1.17.1 - 1.19.4 | 3.6.8 | 17 | Paper | ❌ _Support ended_ | -| 1.16.5 | 3.2.1 | 16 | Paper | ❌ _Support ended_ | +| Minecraft | Latest HuskSync | Java Version | Platforms | Support Status | +|:---------------:|:---------------:|:------------:|:--------------|:-----------------------------| +| 1.21.4 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** | +| 1.21.3 | 3.7.1 | 21 | Paper, Fabric | 🗃️ Archived (December 2024) | +| 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **November 2024** (LTS) | +| 1.20.6 | 3.6.8 | 17 | Paper | 🗃️ Archived (October 2024) | +| 1.20.4 | 3.6.8 | 17 | Paper | 🗃️ Archived (July 2024) | +| 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) | +| 1.17.1 - 1.19.4 | 3.6.8 | 17 | Paper | 🗃️ Archived | +| 1.16.5 | 3.2.1 | 16 | Paper | 🗃️ Archived | HuskSync is primarily developed against the latest release. Old Minecraft versions are allocated a support channel based on popularity, mod support, etc: diff --git a/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java b/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java index 3e1c661b..2989e04a 100644 --- a/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java +++ b/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java @@ -94,7 +94,8 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync, private static final int VERSION1_20_4 = 3700; private static final int VERSION1_20_5 = 3837; private static final int VERSION1_21_1 = 3955; - private static final int VERSION1_21_3 = 4082; // Current + private static final int VERSION1_21_3 = 4082; + private static final int VERSION1_21_4 = 4189; // Current private final TreeMap> serializers = Maps.newTreeMap( SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR @@ -373,7 +374,8 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync, case "1.20.5", "1.20.6" -> VERSION1_20_5; case "1.21", "1.21.1" -> VERSION1_21_1; case "1.21.2", "1.21.3" -> VERSION1_21_3; - default -> VERSION1_21_3; // Current supported ver + case "1.21.4" -> VERSION1_21_4; + default -> VERSION1_21_4; // Current supported ver }; } diff --git a/gradle.properties b/gradle.properties index 1859f0aa..80c2309e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ javaVersion=21 # Plugin settings plugin_version=3.7.2 -minecraft_version=1.21.3 +minecraft_version=1.21.4 plugin_archive=husksync plugin_description=A modern, cross-server player data synchronization system @@ -18,14 +18,14 @@ mongodb_driver_version=5.1.2 snappy_version=1.1.10.6 # Spigot/Paper build settings -bukkit_spigot_api=1.21.3-R0.1-SNAPSHOT -bukkit_paper_api=1.21.3-R0.1-SNAPSHOT +bukkit_spigot_api=1.21.4-R0.1-SNAPSHOT +bukkit_paper_api=1.21.4-R0.1-SNAPSHOT # Fabric build settings fabric_loom_version=1.8-SNAPSHOT fabric_loader_version=0.16.9 -fabric_yarn_mappings=1.21.3+build.2 -fabric_api_version=0.107.0+1.21.3 +fabric_yarn_mappings=1.21.4+build.1 +fabric_api_version=0.111.0+1.21.4 fabric_adventure_platform_version=6.1.0 fabric_permissions_api_version=0.3.3 -fabric_sgui_version=1.7.2+1.21.2 \ No newline at end of file +fabric_sgui_version=1.8.1+1.21.4 \ No newline at end of file diff --git a/paper/build.gradle b/paper/build.gradle index c7e230cb..3bafd0d6 100644 --- a/paper/build.gradle +++ b/paper/build.gradle @@ -49,6 +49,6 @@ shadowJar { tasks { runServer { - minecraftVersion('1.21.3') + minecraftVersion('1.21.4') } } \ No newline at end of file diff --git a/test/spin_network.py b/test/spin_network.py index e68aa9d8..8c9ac660 100644 --- a/test/spin_network.py +++ b/test/spin_network.py @@ -13,7 +13,7 @@ from tqdm import tqdm class Parameters: root_dir = './servers/' proxy_version = "1.21" - minecraft_version = '1.21.3' + minecraft_version = '1.21.4' eula_agreement = 'true' backend_names = ['alpha', 'beta']