Skip to content

1.21.6-1.21.8 port #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaFuqs merged 1 commit into from
Sep 6, 2025
Merged

1.21.6-1.21.8 port #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/main/java/de/dafuqs/revelationary/advancement_criteria/AdvancementCountCriterion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/dafuqs/revelationary/api/advancements/AdvancementHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/dafuqs/revelationary/mixin/client/MinecraftClientMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Loading