MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use AdvancementHolder when hooking into other awards

Browse source
This commit is contained in:
Frank 2023-12-19 15:26:39 +01:00
parent 95a1a21f04
commit 6cf4d7fccb
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/betterx/betterend/events/PlayerAdvancementsCallback.java
View file

@ -1,6 +1,6 @@
package org.betterx.betterend.events; package org.betterx.betterend.events;
import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.Event;
@ -17,5 +17,5 @@ public interface PlayerAdvancementsCallback {
} }
); );
void onAdvancementComplete(ServerPlayer player, Advancement advancement, String criterionName); void onAdvancementComplete(ServerPlayer player, AdvancementHolder advancement, String criterionName);
} }

2
src/main/java/org/betterx/betterend/integration/Integrations.java
View file

@ -28,7 +28,7 @@ public class Integrations {
PlayerAdvancementsCallback.PLAYER_ADVANCEMENT_COMPLETE.register((player, advancement, criterionName) -> { PlayerAdvancementsCallback.PLAYER_ADVANCEMENT_COMPLETE.register((player, advancement, criterionName) -> {
ResourceLocation advId = new ResourceLocation("minecraft:end/enter_end_gateway"); ResourceLocation advId = new ResourceLocation("minecraft:end/enter_end_gateway");
if (advId.equals(advancement.getId())) { if (advId.equals(advancement.id())) {
player.addItem(new ItemStack(GuideBookItem.GUIDE_BOOK)); player.addItem(new ItemStack(GuideBookItem.GUIDE_BOOK));
} }
}); });

4
src/main/java/org/betterx/betterend/mixin/common/PlayerAdvancementsMixin.java
View file

@ -2,7 +2,7 @@ package org.betterx.betterend.mixin.common;
import org.betterx.betterend.events.PlayerAdvancementsCallback; import org.betterx.betterend.events.PlayerAdvancementsCallback;
import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementHolder;
import net.minecraft.server.PlayerAdvancements; import net.minecraft.server.PlayerAdvancements;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -19,7 +19,7 @@ public abstract class PlayerAdvancementsMixin {
private ServerPlayer player; private ServerPlayer player;
@Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V", shift = Shift.AFTER)) @Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V", shift = Shift.AFTER))
public void be_award(Advancement advancement, String criterionName, CallbackInfoReturnable<Boolean> info) { public void be_award(AdvancementHolder advancement, String criterionName, CallbackInfoReturnable<Boolean> info) {
PlayerAdvancementsCallback.PLAYER_ADVANCEMENT_COMPLETE.invoker() PlayerAdvancementsCallback.PLAYER_ADVANCEMENT_COMPLETE.invoker()
.onAdvancementComplete( .onAdvancementComplete(
player, player,