diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c29a787..a7bb7812 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,6 @@ jobs: fabric-1.21.4 fabric-1.21.5 fabric-1.21.8 - fabric-1.21.10 distro-groups: | paper paper @@ -71,7 +70,6 @@ jobs: fabric fabric fabric - fabric distro-descriptions: | Paper 1.21.1 Paper 1.21.4 @@ -82,7 +80,6 @@ jobs: Fabric 1.21.4 Fabric 1.21.5 Fabric 1.21.8 - Fabric 1.21.10 files: | target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.1.jar target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.4.jar @@ -92,5 +89,4 @@ jobs: target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.1.jar target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.4.jar target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.5.jar - target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.8.jar - target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.10.jar \ No newline at end of file + target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.8.jar \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1132f2d..e2f33e9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,6 @@ jobs: fabric-1.21.4 fabric-1.21.5 fabric-1.21.8 - fabric-1.21.10 distro-groups: | paper paper @@ -60,7 +59,6 @@ jobs: fabric fabric fabric - fabric distro-descriptions: | Paper 1.21.1 Paper 1.21.4 @@ -71,7 +69,6 @@ jobs: Fabric 1.21.4 Fabric 1.21.5 Fabric 1.21.8 - Fabric 1.21.10 files: | target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.1.jar target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.4.jar @@ -81,5 +78,4 @@ jobs: target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.4.jar target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.5.jar - target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.8.jar - target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.10.jar \ No newline at end of file + target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.8.jar \ No newline at end of file diff --git a/README.md b/README.md index fecbea6d..06306030 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ HuskSync supports the following [compatible versions](https://william278.net/doc | Minecraft | Latest HuskSync | Java Version | Platforms | Support Status | |:---------------:|:---------------:|:------------:|:--------------|:------------------------------| | 1.21.10 | _latest_ | 21 | Paper | ✅ **Active Release** | -| 1.21.7/8 | _latest_ | 21 | Paper | ✅ **August 2026** | +| 1.21.7/8 | _latest_ | 21 | Paper, Fabric | ✅ **August 2026** | | 1.21.6 | 3.8.5 | 21 | Paper | 🗃️ Archived (July 2025) | | 1.21.5 | _latest_ | 21 | Paper | ✅ **February 2026** (Non-LTS) | | 1.21.4 | _latest_ | 21 | Paper, Fabric | ✅ **February 2026** (Non-LTS) | diff --git a/build.gradle b/build.gradle index 7f78d1a8..99df81ac 100644 --- a/build.gradle +++ b/build.gradle @@ -100,14 +100,14 @@ allprojects { include '**/*.java' newLine = true } - + test { useJUnitPlatform() } processResources { def tokenMap = rootProject.ext.properties - tokenMap.merge("grgit",'',(s, s2) -> s) + tokenMap.merge("grgit", '', (s, s2) -> s) filesMatching(['**/*.json', '**/*.yml']) { filter ReplaceTokens as Class, beginToken: '${', endToken: '}', tokens: tokenMap diff --git a/bukkit/1.21.10/gradle.properties b/bukkit/1.21.10/gradle.properties deleted file mode 100644 index 178efc93..00000000 --- a/bukkit/1.21.10/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -minecraft_version_range=1.21.10 -minecraft_version_numeric=12110 -minecraft_api_version=1.21 -paper_api_version=1.21.10-R0.1-SNAPSHOT \ No newline at end of file diff --git a/docs/Compatibility.md b/docs/Compatibility.md index fcd0aa6d..4100354d 100644 --- a/docs/Compatibility.md +++ b/docs/Compatibility.md @@ -3,7 +3,7 @@ HuskSync supports the following versions of Minecraft. Since v3.7, you must down | Minecraft | Latest HuskSync | Java Version | Platforms | Support Status | |:---------------:|:---------------:|:------------:|:--------------|:------------------------------| | 1.21.10 | _latest_ | 21 | Paper | ✅ **Active Release** | -| 1.21.7/8 | _latest_ | 21 | Paper | ✅ **August 2026** | +| 1.21.7/8 | _latest_ | 21 | Paper, Fabric | ✅ **August 2026** | | 1.21.6 | 3.8.5 | 21 | Paper | 🗃️ Archived (July 2025) | | 1.21.5 | _latest_ | 21 | Paper | ✅ **February 2026** (Non-LTS) | | 1.21.4 | _latest_ | 21 | Paper, Fabric | ✅ **February 2026** (Non-LTS) | diff --git a/fabric/1.21.1/gradle.properties b/fabric/1.21.1/gradle.properties index f9b7955c..226977ce 100644 --- a/fabric/1.21.1/gradle.properties +++ b/fabric/1.21.1/gradle.properties @@ -1,6 +1,6 @@ essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.1+build.3:v2 -minecraft_version_range='1.21.1' +minecraft_version_range=1.21.1 fabric_loader_version=0.16.10 fabric_api_version=0.107.0+1.21.1 diff --git a/fabric/1.21.4/gradle.properties b/fabric/1.21.4/gradle.properties index 981f8b68..9763f1a5 100644 --- a/fabric/1.21.4/gradle.properties +++ b/fabric/1.21.4/gradle.properties @@ -1,6 +1,6 @@ essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.4+build.4:v2 -minecraft_version_range='1.21.4' +minecraft_version_range=1.21.4 fabric_loader_version=0.16.10 fabric_api_version=0.116.1+1.21.4 diff --git a/fabric/1.21.5/gradle.properties b/fabric/1.21.5/gradle.properties index 77fd17c9..af1ffcd9 100644 --- a/fabric/1.21.5/gradle.properties +++ b/fabric/1.21.5/gradle.properties @@ -1,6 +1,6 @@ essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.5+build.1:v2 -minecraft_version_range='1.21.5' +minecraft_version_range=1.21.5 fabric_loader_version=0.16.14 fabric_api_version=0.122.0+1.21.5 diff --git a/gradle.properties b/gradle.properties index a5f5f830..32227f71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,5 @@ mongodb_driver_version=5.5.0 snappy_version=1.1.10.7 # Fabric settings -loom.ignoreDependencyLoomVersionValidation=true \ No newline at end of file +loom.ignoreDependencyLoomVersionValidation=true +loom.disableUnpick=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b95..00000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..ca025c83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 2751996a..79c792fc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,11 +5,11 @@ pluginManagement { maven { url 'https://maven.fabricmc.net/' } maven { url 'https://maven.architectury.dev/' } maven { url 'https://maven.minecraftforge.net' } - maven { url 'https://repo.essential.gg/repository/maven-public' } + maven { url 'https://repo.essential.gg/public' } } plugins { - def egtVersion = "0.6.5" + def egtVersion = "0.6.10" id("gg.essential.defaults") version egtVersion id("gg.essential.multi-version.root") version egtVersion }