Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-19 14:59:21 +00:00
Code Issues Releases Activity

feat: target Minecraft 1.21.4, replacing 1.21.3

Browse Source
This commit is contained in:
William
2024-12-07 20:43:11 +00:00
parent 7967d00208
commit cedd12a048
10 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/ci_master.yml vendored
View File

@@ -14,7 +14,7 @@ permissions:
jobs: jobs:
build: build:
name: 'Build - 1.21.3' name: 'Build - 1.21.4'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: 'Setup JDK 21 📦' - name: 'Setup JDK 21 📦'
@@ -28,7 +28,7 @@ jobs:
gradle-version: '8.8' gradle-version: '8.8'
- name: 'Checkout for CI 🛎️' - name: 'Checkout for CI 🛎️'
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: '[Current - 1.21.3] Build 🛎️' - name: '[Current - 1.21.4] Build 🛎️'
run: | run: |
./gradlew clean build publish ./gradlew clean build publish
env: env:
@@ -55,14 +55,14 @@ jobs:
version: ${{ env.version_name }} version: ${{ env.version_name }}
changelog: ${{ github.event.head_commit.message }} changelog: ${{ github.event.head_commit.message }}
distro-names: | distro-names: |
paper-1.21.3 paper-1.21.4
fabric-1.21.3 fabric-1.21.4
distro-groups: | distro-groups: |
paper paper
fabric fabric
distro-descriptions: | distro-descriptions: |
Paper 1.21.3 Paper 1.21.4
Fabric 1.21.3 Fabric 1.21.4
files: | files: |
target/HuskSync-Paper-${{ env.version_name }}+mc.1.21.3.jar target/HuskSync-Paper-${{ env.version_name }}+mc.1.21.4.jar
target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.3.jar target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.4.jar

20
.github/workflows/release.yml vendored
View File

@@ -23,10 +23,10 @@ jobs:
uses: gradle/actions/setup-gradle@v4 uses: gradle/actions/setup-gradle@v4
with: with:
gradle-version: '8.8' gradle-version: '8.8'
- name: '[Current - 1.21.3] Checkout for CI 🛎️' - name: '[Current - 1.21.4] Checkout for CI 🛎️'
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
path: '1_21_3' path: '1_21_4'
- name: '[Non-LTS - 1.21.1] Checkout for CI 🛎️' - name: '[Non-LTS - 1.21.1] Checkout for CI 🛎️'
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
@@ -37,10 +37,10 @@ jobs:
with: with:
ref: 'minecraft/1.20.1' ref: 'minecraft/1.20.1'
path: '1_20_1' path: '1_20_1'
- name: '[Current - 1.21.3] Build 🛎️' - name: '[Current - 1.21.4] Build 🛎️'
run: | run: |
mkdir target mkdir target
cd 1_21_3 cd 1_21_4
./gradlew clean build publish -Dforce-hide-version-meta=1 ./gradlew clean build publish -Dforce-hide-version-meta=1
cp -rf target/* ../target/ cp -rf target/* ../target/
cd .. cd ..
@@ -79,8 +79,8 @@ jobs:
version: ${{ github.event.release.tag_name }} version: ${{ github.event.release.tag_name }}
changelog: ${{ github.event.release.body }} changelog: ${{ github.event.release.body }}
distro-names: | distro-names: |
paper-1.21.3 paper-1.21.4
fabric-1.21.3 fabric-1.21.4
paper-1.21.1 paper-1.21.1
fabric-1.21.1 fabric-1.21.1
paper-1.20.1 paper-1.20.1
@@ -93,15 +93,15 @@ jobs:
paper paper
fabric fabric
distro-descriptions: | distro-descriptions: |
Paper 1.21.3 Paper 1.21.4
Fabric 1.21.3 Fabric 1.21.4
Paper 1.21.1 Paper 1.21.1
Fabric 1.21.1 Fabric 1.21.1
Paper 1.20.1 Paper 1.20.1
Fabric 1.20.1 Fabric 1.20.1
files: | files: |
target/HuskSync-Paper-${{ 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.3.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-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-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar
target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.20.1.jar target/HuskSync-Paper-${{ github.event.release.tag_name }}+mc.1.20.1.jar

19
README.md
View File

@@ -46,15 +46,16 @@
## Compatibility ## 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: 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 | | Minecraft | Latest HuskSync | Java Version | Platforms | Support Status |
|:---------------:|:---------------:|:------------:|:--------------|:------------------------------| |:---------------:|:---------------:|:------------:|:--------------|:-----------------------------|
| 1.21.3 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** | | 1.21.4 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** |
| 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **December 2024** (Non-LTS) | | 1.21.3 | 3.7.1 | 21 | Paper, Fabric | 🗃️ Archived (December 2024) |
| 1.20.6 | 3.6.8 | 17 | Paper | ❌ _October 2024_ | | 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **November 2024** (LTS) |
| 1.20.4 | 3.6.8 | 17 | Paper | ❌ _July 2024_ | | 1.20.6 | 3.6.8 | 17 | Paper | 🗃️ Archived (October 2024) |
| 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) | | 1.20.4 | 3.6.8 | 17 | Paper | 🗃️ Archived (July 2024) |
| 1.17.1 - 1.19.4 | 3.6.8 | 17 | Paper | ❌ _Support ended_ | | 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) |
| 1.16.5 | 3.2.1 | 16 | Paper | ❌ _Support ended_ | | 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: HuskSync is primarily developed against the latest release. Old Minecraft versions are allocated a support channel based on popularity, mod support, etc:

2
bukkit/build.gradle
View File

@@ -9,7 +9,7 @@ dependencies {
implementation 'net.kyori:adventure-platform-bukkit:4.3.4' implementation 'net.kyori:adventure-platform-bukkit:4.3.4'
implementation 'dev.triumphteam:triumph-gui:3.1.10' implementation 'dev.triumphteam:triumph-gui:3.1.10'
implementation 'space.arim.morepaperlib:morepaperlib:0.4.4' 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 "org.spigotmc:spigot-api:${bukkit_spigot_api}"
compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0' compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0'

1
bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java
View File

@@ -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.20.5", "1.20.6" -> DataFixerUtil.VERSION1_20_5;
case "1.21", "1.21.1" -> DataFixerUtil.VERSION1_21; case "1.21", "1.21.1" -> DataFixerUtil.VERSION1_21;
case "1.21.2", "1.21.3" -> DataFixerUtil.VERSION1_21_2; case "1.21.2", "1.21.3" -> DataFixerUtil.VERSION1_21_2;
case "1.21.4" -> 4189/*DataFixerUtil.VERSION1_21_4*/;
default -> DataFixerUtil.getCurrentVersion(); default -> DataFixerUtil.getCurrentVersion();
}; };
} }

19
docs/Compatibility.md
View File

@@ -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: 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 | | Minecraft | Latest HuskSync | Java Version | Platforms | Support Status |
|:---------------:|:---------------:|:------------:|:--------------|:------------------------------| |:---------------:|:---------------:|:------------:|:--------------|:-----------------------------|
| 1.21.3 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** | | 1.21.4 | _latest_ | 21 | Paper, Fabric | ✅ **Active Release** |
| 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **December 2024** (Non-LTS) | | 1.21.3 | 3.7.1 | 21 | Paper, Fabric | 🗃️ Archived (December 2024) |
| 1.20.6 | 3.6.8 | 17 | Paper | ❌ _October 2024_ | | 1.21.1 | _latest_ | 21 | Paper, Fabric | ✅ **November 2024** (LTS) |
| 1.20.4 | 3.6.8 | 17 | Paper | ❌ _July 2024_ | | 1.20.6 | 3.6.8 | 17 | Paper | 🗃️ Archived (October 2024) |
| 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) | | 1.20.4 | 3.6.8 | 17 | Paper | 🗃️ Archived (July 2024) |
| 1.17.1 - 1.19.4 | 3.6.8 | 17 | Paper | ❌ _Support ended_ | | 1.20.1 | _latest_ | 17 | Paper, Fabric | ✅ **November 2025** (LTS) |
| 1.16.5 | 3.2.1 | 16 | Paper | ❌ _Support ended_ | | 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: HuskSync is primarily developed against the latest release. Old Minecraft versions are allocated a support channel based on popularity, mod support, etc:

6
fabric/src/main/java/net/william278/husksync/FabricHuskSync.java
View File

@@ -94,7 +94,8 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync,
private static final int VERSION1_20_4 = 3700; private static final int VERSION1_20_4 = 3700;
private static final int VERSION1_20_5 = 3837; private static final int VERSION1_20_5 = 3837;
private static final int VERSION1_21_1 = 3955; 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<Identifier, Serializer<? extends Data>> serializers = Maps.newTreeMap( private final TreeMap<Identifier, Serializer<? extends Data>> serializers = Maps.newTreeMap(
SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR 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.20.5", "1.20.6" -> VERSION1_20_5;
case "1.21", "1.21.1" -> VERSION1_21_1; case "1.21", "1.21.1" -> VERSION1_21_1;
case "1.21.2", "1.21.3" -> VERSION1_21_3; 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
}; };
} }

12
gradle.properties
View File

@@ -5,7 +5,7 @@ javaVersion=21
# Plugin settings # Plugin settings
plugin_version=3.7.2 plugin_version=3.7.2
minecraft_version=1.21.3 minecraft_version=1.21.4
plugin_archive=husksync plugin_archive=husksync
plugin_description=A modern, cross-server player data synchronization system 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 snappy_version=1.1.10.6
# Spigot/Paper build settings # Spigot/Paper build settings
bukkit_spigot_api=1.21.3-R0.1-SNAPSHOT bukkit_spigot_api=1.21.4-R0.1-SNAPSHOT
bukkit_paper_api=1.21.3-R0.1-SNAPSHOT bukkit_paper_api=1.21.4-R0.1-SNAPSHOT
# Fabric build settings # Fabric build settings
fabric_loom_version=1.8-SNAPSHOT fabric_loom_version=1.8-SNAPSHOT
fabric_loader_version=0.16.9 fabric_loader_version=0.16.9
fabric_yarn_mappings=1.21.3+build.2 fabric_yarn_mappings=1.21.4+build.1
fabric_api_version=0.107.0+1.21.3 fabric_api_version=0.111.0+1.21.4
fabric_adventure_platform_version=6.1.0 fabric_adventure_platform_version=6.1.0
fabric_permissions_api_version=0.3.3 fabric_permissions_api_version=0.3.3
fabric_sgui_version=1.7.2+1.21.2 fabric_sgui_version=1.8.1+1.21.4

2
paper/build.gradle
View File

@@ -49,6 +49,6 @@ shadowJar {
tasks { tasks {
runServer { runServer {
minecraftVersion('1.21.3') minecraftVersion('1.21.4')
} }
} }

2
test/spin_network.py
View File

@@ -13,7 +13,7 @@ from tqdm import tqdm
class Parameters: class Parameters:
root_dir = './servers/' root_dir = './servers/'
proxy_version = "1.21" proxy_version = "1.21"
minecraft_version = '1.21.3' minecraft_version = '1.21.4'
eula_agreement = 'true' eula_agreement = 'true'
backend_names = ['alpha', 'beta'] backend_names = ['alpha', 'beta']