From a52bb1323343ce05be7310facf30d4f68cd03b6a Mon Sep 17 00:00:00 2001 From: imreallybadatnames Date: Sat, 30 Aug 2025 17:27:13 +1100 Subject: [PATCH] 1.21.6 --- gradle.properties | 14 +++++++------- .../AdvancementCountCriterion.java | 2 +- .../api/advancements/AdvancementHelper.java | 2 +- .../mixin/client/MinecraftClientMixin.java | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4a3e447..90afe88 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,20 +2,20 @@ org.gradle.jvmargs = -Xmx2G # Fabric Properties -minecraft_version=1.21.5 -yarn_mappings=1.21.5+build.1 +minecraft_version=1.21.6 +yarn_mappings=1.21.6+build.1 loader_version=0.17.2 loom_version=1.11-SNAPSHOT # Mod Properties -mod_version=1.5.1+1.21.5 +mod_version=1.5.1+1.21.6 maven_group=de.dafuqs archives_base_name = revelationary # https://fabricmc.net/develop/ -fabric_api_version=0.128.2+1.21.5 +fabric_api_version=0.128.2+1.21.6 -jade_version=18.1.0+fabric -wthit_version=15.0.2 -rei_version=19.0.809 +jade_version=19.3.2+fabric +wthit_version=16.0.1 +rei_version=20.0.811 # jei_version=19.21.0.247 \ No newline at end of file diff --git a/src/main/java/de/dafuqs/revelationary/advancement_criteria/AdvancementCountCriterion.java b/src/main/java/de/dafuqs/revelationary/advancement_criteria/AdvancementCountCriterion.java index 367da49..b666154 100644 --- a/src/main/java/de/dafuqs/revelationary/advancement_criteria/AdvancementCountCriterion.java +++ b/src/main/java/de/dafuqs/revelationary/advancement_criteria/AdvancementCountCriterion.java @@ -31,7 +31,7 @@ public record Conditions(Optional player, List .apply(inst, Conditions::new)); public boolean matches(ServerPlayerEntity serverPlayerEntity) { - ServerAdvancementLoader loader = serverPlayerEntity.server.getAdvancementLoader(); + ServerAdvancementLoader loader = serverPlayerEntity.getWorld().getServer().getAdvancementLoader(); if(loader == null) { return false; } diff --git a/src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementHelper.java b/src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementHelper.java index 2a89ddd..110be97 100644 --- a/src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementHelper.java +++ b/src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementHelper.java @@ -29,7 +29,7 @@ public static boolean hasAdvancement(PlayerEntity playerEntity, Identifier advan } if (playerEntity instanceof ServerPlayerEntity serverPlayerEntity) { - AdvancementEntry advancement = serverPlayerEntity.server.getAdvancementLoader().get(advancementIdentifier); + AdvancementEntry advancement = serverPlayerEntity.getWorld().getServer().getAdvancementLoader().get(advancementIdentifier); if (advancement == null) { Revelationary.logError("Player " + playerEntity.getName() + " was getting an advancement check for an advancement that does not exist: " + advancementIdentifier); return false; diff --git a/src/main/java/de/dafuqs/revelationary/mixin/client/MinecraftClientMixin.java b/src/main/java/de/dafuqs/revelationary/mixin/client/MinecraftClientMixin.java index 0c21f32..56ba75f 100644 --- a/src/main/java/de/dafuqs/revelationary/mixin/client/MinecraftClientMixin.java +++ b/src/main/java/de/dafuqs/revelationary/mixin/client/MinecraftClientMixin.java @@ -10,8 +10,8 @@ @Mixin(MinecraftClient.class) public abstract class MinecraftClientMixin { - @Inject(at = @At("HEAD"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;)V") - public void revelationary$onLogout(Screen screen, CallbackInfo info) { + @Inject(at = @At("HEAD"), method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V") + public void revelationary$onLogout(Screen screen, boolean transferring, CallbackInfo info) { ClientAdvancements.playerLogout(); } } \ No newline at end of file