Merge pull request #29 from imreallybadatnames/1.21.6

1.21.6-1.21.8 port

Author: DaFuqs

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

src/main/java/de/dafuqs/revelationary/advancement_criteria/AdvancementCountCriterion.java

@@ -31,7 +31,7 @@ public record Conditions(Optional<LootContextPredicate> player, List<Identifier>
 			.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;
 			}

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;

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();
 	}
 }