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 MC 1.21.8 instead of .7

Browse Source
This commit is contained in:
William278
2025-08-12 23:27:03 +01:00
parent a9ea4d34e5
commit 24545563fa
12 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@@ -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
target/HuskSync-Fabric-${{ env.version_name }}+mc.1.21.8.jar

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

@@ -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
target/HuskSync-Fabric-${{ github.event.release.tag_name }}+mc.1.21.8.jar

0
bukkit/1.21.7/gradle.properties → bukkit/1.21.8/gradle.properties
View File

6
bukkit/build.gradle
View File

@@ -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'

4
common/build.gradle
View File

@@ -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'

9
fabric/1.21.7/gradle.properties
View File

@@ -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

9
fabric/1.21.8/gradle.properties Normal file
View File

@@ -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

4
fabric/build.gradle
View File

@@ -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

2
fabric/mainProject
View File

@@ -1 +1 @@
1.21.7
1.21.8

10
fabric/root.gradle
View File

@@ -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)
}

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

@@ -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;

4
fabric/src/main/java/net/william278/husksync/data/FabricSerializer.java
View File

@@ -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);