From 24545563fa9a8f2aea5ad7b6246652670260daee Mon Sep 17 00:00:00 2001 From: William278 Date: Tue, 12 Aug 2025 23:27:03 +0100 Subject: [PATCH] feat: target MC 1.21.8 instead of .7 --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 12 ++++++------ bukkit/{1.21.7 => 1.21.8}/gradle.properties | 0 bukkit/build.gradle | 6 +++--- common/build.gradle | 4 ++-- fabric/1.21.7/gradle.properties | 9 --------- fabric/1.21.8/gradle.properties | 9 +++++++++ fabric/build.gradle | 4 ++-- fabric/mainProject | 2 +- fabric/root.gradle | 10 +++++----- .../java/net/william278/husksync/FabricHuskSync.java | 2 +- .../william278/husksync/data/FabricSerializer.java | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) rename bukkit/{1.21.7 => 1.21.8}/gradle.properties (100%) delete mode 100644 fabric/1.21.7/gradle.properties create mode 100644 fabric/1.21.8/gradle.properties diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6af1f985..5ddd049b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,12 +55,12 @@ jobs: paper-1.21.1 paper-1.21.4 paper-1.21.5 - paper-1.21.7 + paper-1.21.8 fabric-1.20.1 fabric-1.21.1 fabric-1.21.4 fabric-1.21.5 - fabric-1.21.7 + fabric-1.21.8 distro-groups: | paper paper @@ -77,20 +77,20 @@ jobs: Paper 1.21.1 Paper 1.21.4 Paper 1.21.5 - Paper 1.21.7 + Paper 1.21.8 Fabric 1.20.1 Fabric 1.21.1 Fabric 1.21.4 Fabric 1.21.5 - Fabric 1.21.7 + Fabric 1.21.8 files: | target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.20.1.jar target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.1.jar target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.4.jar target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.5.jar - target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.7.jar + target/HuskSync-Bukkit-${{ env.version_name }}+mc.1.21.8.jar target/HuskSync-Fabric-${{ env.version_name }}+mc.1.20.1.jar 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.7.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 65ca938a..d5a7faa2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,12 +44,12 @@ jobs: paper-1.21.1 paper-1.21.4 paper-1.21.5 - paper-1.21.7 + paper-1.21.8 fabric-1.20.1 fabric-1.21.1 fabric-1.21.4 fabric-1.21.5 - fabric-1.21.7 + fabric-1.21.8 distro-groups: | paper paper @@ -66,20 +66,20 @@ jobs: Paper 1.21.1 Paper 1.21.4 Paper 1.21.5 - Paper 1.21.7 + Paper 1.21.8 Fabric 1.20.1 Fabric 1.21.1 Fabric 1.21.4 Fabric 1.21.5 - Fabric 1.21.7 + Fabric 1.21.8 files: | target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.20.1.jar 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 target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.5.jar - target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.7.jar + target/HuskSync-Bukkit-${{ github.event.release.tag_name }}+mc.1.21.8.jar target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.20.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.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.7.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/bukkit/1.21.7/gradle.properties b/bukkit/1.21.8/gradle.properties similarity index 100% rename from bukkit/1.21.7/gradle.properties rename to bukkit/1.21.8/gradle.properties diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 994257c4..2b133a25 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -8,9 +8,9 @@ plugins { dependencies { implementation project(path: ':common') - implementation 'net.william278.uniform:uniform-bukkit:1.3.8' - implementation 'net.william278.uniform:uniform-paper:1.3.8' - implementation 'net.william278.toilet:toilet-bukkit:1.0.15' + implementation 'net.william278.uniform:uniform-bukkit:1.3.9' + implementation 'net.william278.uniform:uniform-paper:1.3.9' + implementation 'net.william278.toilet:toilet-bukkit:1.0.16' implementation 'net.william278:mpdbdataconverter:1.0.1' implementation 'net.william278:hsldataconverter:1.0' implementation 'net.william278:mapdataapi:2.0' diff --git a/common/build.gradle b/common/build.gradle index a9a1631b..213c09fc 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -17,9 +17,9 @@ dependencies { exclude module: 'slf4j-api' } - compileOnlyApi 'net.william278.toilet:toilet-common:1.0.15' + compileOnlyApi 'net.william278.toilet:toilet-common:1.0.16' - compileOnly 'net.william278.uniform:uniform-common:1.3.8' + compileOnly 'net.william278.uniform:uniform-common:1.3.9' compileOnly 'com.mojang:brigadier:1.1.8' compileOnly 'org.projectlombok:lombok:1.18.38' compileOnly 'org.jetbrains:annotations:26.0.2' diff --git a/fabric/1.21.7/gradle.properties b/fabric/1.21.7/gradle.properties deleted file mode 100644 index d1839f99..00000000 --- a/fabric/1.21.7/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.7+build.2:v2 - -minecraft_version_range=>=1.21.7 <=1.21.8 - -fabric_loader_version=0.16.14 -fabric_api_version=0.128.1+1.21.7 -fabric_permissions_api_version=0.4.1 -fabric_adventure_platform_version=6.5.0-SNAPSHOT -fabric_sgui_version=1.10.0+1.21.6 \ No newline at end of file diff --git a/fabric/1.21.8/gradle.properties b/fabric/1.21.8/gradle.properties new file mode 100644 index 00000000..7bae9461 --- /dev/null +++ b/fabric/1.21.8/gradle.properties @@ -0,0 +1,9 @@ +essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.8+build.1:v2 + +minecraft_version_range=>=1.21.7 <=1.21.8 + +fabric_loader_version=0.17.2 +fabric_api_version=0.131.0+1.21.8 +fabric_permissions_api_version=0.4.1 +fabric_adventure_platform_version=6.6.0 +fabric_sgui_version=1.10.0+1.21.6 \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index f65c77f7..525810a0 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -14,8 +14,8 @@ dependencies { modImplementation include("net.kyori:adventure-platform-fabric:${fabric_adventure_platform_version}") modImplementation include("me.lucko:fabric-permissions-api:${fabric_permissions_api_version}") modImplementation include("eu.pb4:sgui:${fabric_sgui_version}") - modImplementation include("net.william278.uniform:uniform-fabric:1.3.8+${project.name}") - modImplementation include("net.william278.toilet:toilet-fabric:1.0.15+${project.name}") + modImplementation include("net.william278.uniform:uniform-fabric:1.3.9+${project.name}") + modImplementation include("net.william278.toilet:toilet-fabric:1.0.16+${project.name}") modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" // Manually include config deps due to the way including api deps works diff --git a/fabric/mainProject b/fabric/mainProject index 915ddf30..5c9a6fe7 100644 --- a/fabric/mainProject +++ b/fabric/mainProject @@ -1 +1 @@ -1.21.7 \ No newline at end of file +1.21.8 \ No newline at end of file diff --git a/fabric/root.gradle b/fabric/root.gradle index 9eafd9a2..8e301dee 100644 --- a/fabric/root.gradle +++ b/fabric/root.gradle @@ -3,15 +3,15 @@ plugins { } preprocess { - def fabric12107 = createNode("1.21.7", 12107, "yarn") + def fabric12108 = createNode("1.21.8", 12108, "yarn") def fabric12105 = createNode("1.21.5", 12105, "yarn") def fabric12104 = createNode("1.21.4", 12104, "yarn") def fabric12101 = createNode("1.21.1", 12101, "yarn") def fabric12001 = createNode("1.20.1", 12001, "yarn") strictExtraMappings.set(true) - fabric12105.link(fabric12107, null) - fabric12104.link(fabric12107, null) - fabric12101.link(fabric12107, null) - fabric12001.link(fabric12107, null) + fabric12105.link(fabric12108, null) + fabric12104.link(fabric12108, null) + fabric12101.link(fabric12108, null) + fabric12001.link(fabric12108, null) } \ No newline at end of file diff --git a/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java b/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java index bb475679..8904b35b 100644 --- a/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java +++ b/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java @@ -391,7 +391,7 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync, case "1.21.5" -> VERSION1_21_5; case "1.21.6" -> VERSION1_21_6; case "1.21.7" -> VERSION1_21_7; - //#if MC==12107 + //#if MC==12108 default -> VERSION1_21_7; //#elseif MC==12105 //$$ default -> VERSION1_21_5; diff --git a/fabric/src/main/java/net/william278/husksync/data/FabricSerializer.java b/fabric/src/main/java/net/william278/husksync/data/FabricSerializer.java index 539744f7..2be37f86 100644 --- a/fabric/src/main/java/net/william278/husksync/data/FabricSerializer.java +++ b/fabric/src/main/java/net/william278/husksync/data/FabricSerializer.java @@ -274,7 +274,7 @@ public abstract class FabricSerializer { @Nullable private NbtCompound encodeNbt(@NotNull ItemStack item, @NotNull DynamicRegistryManager reg) { try { - //#if MC>=12107 + //#if MC>=12108 return (NbtCompound) ItemStack.CODEC.encodeStart(reg.getOps(NbtOps.INSTANCE), item).getOrThrow(); //#elseif MC>=12104 //$$ return (NbtCompound) item.toNbt(reg); @@ -292,7 +292,7 @@ public abstract class FabricSerializer { @NotNull private ItemStack decodeNbt(@NotNull NbtElement item, @NotNull DynamicRegistryManager reg) { - //#if MC>=12107 + //#if MC>=12108 final @Nullable ItemStack stack = ItemStack.CODEC.decode(reg.getOps(NbtOps.INSTANCE), item).getOrThrow().getFirst(); //#elseif MC>12001 //$$ final @Nullable ItemStack stack = ItemStack.fromNbt(reg, item).orElse(null);