feat: fully update to Minecraft 1.21.3

WiIIiam278 · Oct 27, 2024 · 6ce1696 · 6ce1696
1 parent 6ae1904
commit 6ce1696
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,19 +54,19 @@ jobs:
           distro-names: |
             paper
             sponge-10
-            fabric-1.21.1
+            fabric-1.21.3
           distro-groups: |
             paper
             sponge
             fabric
           distro-descriptions: |
             Paper
             Sponge API 10
-            Fabric 1.21.1
+            Fabric 1.21.3
           files: |
             target/HuskHomes-Paper-${{ env.version_name }}.jar
             target/HuskHomes-Sponge-${{ env.version_name }}.jar
-            target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.1.jar
+            target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.3.jar
       - name: 'Spigot: Publish to Modrinth & Hangar 🚰'
         uses: WiIIiam278/mc-publish@hangar
         with:
@@ -109,6 +109,8 @@ jobs:
             1.20.6
             1.21
             1.21.1
+            1.21.2
+            1.21.3
           java: 17
       - name: 'Sponge: Publish to Modrinth 🧽'
         uses: WiIIiam278/mc-publish@hangar
@@ -148,13 +150,13 @@ jobs:
             plan | suggests | *
             impactor | suggests | *
             placeholder-api | suggests | *
-          files-primary: target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.1.jar
+          files-primary: target/HuskHomes-Fabric-${{ env.version_name }}+mc.1.21.3.jar
           name: HuskHomes (Fabric) v${{ env.version_name }}
           version: ${{ env.version_name }}
           version-type: alpha
           changelog: ${{ github.event.head_commit.message }}
           loaders: |
             fabric
           game-versions: |
-            1.21.1
+            1.21.3
           java: 21
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,19 +43,19 @@ jobs:
           distro-names: |
             paper
             sponge-10
-            fabric-1.21.1
+            fabric-1.21.3
           distro-groups: |
             paper
             sponge
             fabric
           distro-descriptions: |
             Paper
             Sponge API 10
-            Fabric 1.21.1
+            Fabric 1.21.3
           files: |
             target/HuskHomes-Paper-${{ github.event.release.tag_name }}.jar
             target/HuskHomes-Sponge-${{ github.event.release.tag_name }}.jar
-            target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar
+            target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar
       - name: 'Spigot: Publish to Modrinth & Hangar 🚰'
         uses: WiIIiam278/mc-publish@hangar
         with:
@@ -97,6 +97,8 @@ jobs:
             1.20.6
             1.21
             1.21.1
+            1.21.2
+            1.21.3
           java: 17
       - name: 'Sponge: Publish to Modrinth 🧽'
         uses: WiIIiam278/mc-publish@hangar
@@ -134,13 +136,13 @@ jobs:
             plan | suggests | *
             impactor | suggests | *
             placeholder-api | suggests | *
-          files-primary: target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.1.jar
+          files-primary: target/HuskHomes-Fabric-${{ github.event.release.tag_name }}+mc.1.21.3.jar
           name: HuskHomes (Fabric) v${{ github.event.release.tag_name }}
           version: ${{ github.event.release.tag_name }}
           version-type: release
           changelog: ${{ github.event.release.body }}
           loaders: |
             fabric
           game-versions: |
-            1.21.1
+            1.21.3
           java: 21
diff --git a/build.gradle b/build.gradle
@@ -71,11 +71,6 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven {
-            url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
-            mavenContent { snapshotsOnly() }
-        }
-
         maven { url 'https://repo.william278.net/releases/' }
         maven { url 'https://maven.fabricmc.net/' }
         maven { url 'https://libraries.minecraft.net/' }

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -6,6 +6,11 @@ apply plugin: 'fabric-loom'
 loom.serverOnlyMinecraftJar()
 
 repositories {
+    maven {
+        url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+        mavenContent { snapshotsOnly() }
+    }
+
     maven { url 'https://maven.impactdev.net/repository/development/' }
     maven { url 'https://maven.nucleoid.xyz/' }
 }
@@ -15,7 +20,7 @@ dependencies {
     mappings "net.fabricmc:yarn:${fabric_yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
 
-    modImplementation include("net.kyori:adventure-platform-mod:${adventure_platform_mod_version}")
+    modImplementation include("net.kyori:adventure-platform-fabric:${adventure_platform_fabric_version}")
     modImplementation include("me.lucko:fabric-permissions-api:${fabric_permissions_api_version}")
     modImplementation include("eu.pb4:placeholder-api:${fabric_placeholder_api_version}")
     modImplementation include("net.impactdev.impactor.api:economy:${fabric_impactor_api_version}")
@@ -33,7 +38,7 @@ dependencies {
 
     annotationProcessor 'org.projectlombok:lombok:1.18.34'
 
-    shadow project(path: ":common")
+    implementation project(path: ":common")
 }
 
 shadowJar {

diff --git a/fabric/src/main/java/net/william278/huskhomes/FabricHuskHomes.java b/fabric/src/main/java/net/william278/huskhomes/FabricHuskHomes.java
@@ -33,7 +33,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.kyori.adventure.audience.Audience;
-import net.kyori.adventure.platform.fabric.FabricServerAudiences;
+import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences;
 import net.minecraft.entity.Entity;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -123,7 +123,7 @@ public class FabricHuskHomes implements DedicatedServerModInitializer, HuskHomes
     private Server server;
     @Nullable
     private Broker broker;
-    private FabricServerAudiences audiences;
+    private MinecraftServerAudiences audiences;
 
     @Override
     public void onInitializeServer() {
@@ -145,7 +145,7 @@ public void onInitializeServer() {
 
     private void onEnable() {
         // Create adventure audience
-        this.audiences = FabricServerAudiences.of(minecraftServer);
+        this.audiences = MinecraftServerAudiences.of(minecraftServer);
 
         // Initialize the database
         final Database.Type type = getSettings().getDatabase().getType();

diff --git a/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java b/fabric/src/main/java/net/william278/huskhomes/user/FabricUser.java
@@ -154,7 +154,7 @@ public void sendPluginMessage(byte[] message) {
 
     @Override
     public boolean isMoving() {
-        return player.isTouchingWater() || player.isFallFlying() || player.isSprinting() || player.isSneaking();
+        return player.isTouchingWater() || player.isGliding() || player.isSprinting() || player.isSneaking();
     }
 
     @Override

diff --git a/gradle.properties b/gradle.properties
@@ -24,6 +24,6 @@ fabric_loader_version=0.16.7
 fabric_yarn_mappings=1.21.3+build.2
 fabric_api_version=0.107.0+1.21.3
 fabric_permissions_api_version=0.3.2
-adventure_platform_mod_version=6.1.0-SNAPSHOT
+adventure_platform_fabric_version=6.1.0-SNAPSHOT
 fabric_impactor_api_version=5.2.4-SNAPSHOT
 fabric_placeholder_api_version=2.5.0+1.21.2
diff --git a/paper/build.gradle b/paper/build.gradle
@@ -45,7 +45,7 @@ shadowJar {
 
 tasks {
     runServer {
-        minecraftVersion('1.21.1')
+        minecraftVersion('1.21.3')
 
         downloadPlugins {
             url("https://download.luckperms.net/1554/bukkit/loader/LuckPerms-Bukkit-5.4.139.jar")