diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index b780966e1..b2cbd2688 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -45,6 +45,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.advancements.AlfPortalTrigger; import vazkii.botania.common.advancements.CorporeaRequestTrigger; +import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger; import vazkii.botania.common.advancements.RelicBindTrigger; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; @@ -140,6 +141,7 @@ public class Botania { CriteriaTriggers.register(AlfPortalTrigger.INSTANCE); CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE); + CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE); CriteriaTriggers.register(RelicBindTrigger.INSTANCE); proxy.preInit(event); diff --git a/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java b/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java new file mode 100644 index 000000000..788995d93 --- /dev/null +++ b/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java @@ -0,0 +1,109 @@ +package vazkii.botania.common.advancements; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonObject; +import net.minecraft.advancements.ICriterionInstance; +import net.minecraft.advancements.ICriterionTrigger; +import net.minecraft.advancements.PlayerAdvancements; +import net.minecraft.advancements.critereon.*; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.*; + +public class DopplegangerNoArmorTrigger implements ICriterionTrigger { + public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_no_armor"); + public static final DopplegangerNoArmorTrigger INSTANCE = new DopplegangerNoArmorTrigger(); + private final Map playerTrackers = new HashMap<>(); + + private DopplegangerNoArmorTrigger() {} + + @Nonnull + @Override + public ResourceLocation getId() { + return ID; + } + + @Override + public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { + this.playerTrackers.computeIfAbsent(player, DopplegangerNoArmorTrigger.PlayerTracker::new).listeners.add(listener); + } + + @Override + public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { + DopplegangerNoArmorTrigger.PlayerTracker tracker = this.playerTrackers.get(player); + + if(tracker != null) { + tracker.listeners.remove(listener); + + if(tracker.listeners.isEmpty()) { + this.playerTrackers.remove(player); + } + } + } + + @Override + public void removeAllListeners(@Nonnull PlayerAdvancements player) { + playerTrackers.remove(player); + } + + @Nonnull + @Override + public DopplegangerNoArmorTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + return new DopplegangerNoArmorTrigger.Instance(EntityPredicate.deserialize(json.get("guardian")), DamageSourcePredicate.deserialize(json.get("killing_blow"))); + } + + static class PlayerTracker { + private final PlayerAdvancements playerAdvancements; + final Set> listeners = new HashSet<>(); + + PlayerTracker(PlayerAdvancements playerAdvancementsIn) { + this.playerAdvancements = playerAdvancementsIn; + } + + public void trigger(EntityPlayerMP player, EntityDoppleganger guardian, DamageSource src) { + List> list = new ArrayList<>(); + + for(Listener listener : this.listeners) { + if(listener.getCriterionInstance().test(player, guardian, src)) { + list.add(listener); + } + } + + for(Listener listener : list) { + listener.grantCriterion(this.playerAdvancements); + } + } + } + + public void trigger(EntityPlayerMP player, EntityDoppleganger guardian, DamageSource src) { + DopplegangerNoArmorTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); + if(tracker != null) { + tracker.trigger(player, guardian, src); + } + } + + static class Instance implements ICriterionInstance { + private final EntityPredicate guardian; + private final DamageSourcePredicate killingBlow; + + Instance(EntityPredicate count, DamageSourcePredicate indexPos) { + this.guardian = count; + this.killingBlow = indexPos; + } + + @Nonnull + @Override + public ResourceLocation getId() { + return ID; + } + + boolean test(EntityPlayerMP player, EntityDoppleganger guardian, DamageSource src) { + return this.guardian.test(player, guardian) && this.killingBlow.test(player, src); + } + } +} diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index d429185f8..8e25b3aab 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -74,6 +74,7 @@ import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; @@ -443,7 +444,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { super.onDeath(source); EntityLivingBase entitylivingbase = getAttackingEntity(); if(entitylivingbase instanceof EntityPlayerMP && !anyWithArmor) { - PlayerHelper.grantCriterion((EntityPlayerMP) entitylivingbase, new ResourceLocation(LibMisc.MOD_ID, "challenge/gaia_guardian_no_armor"), "code_triggered"); + DopplegangerNoArmorTrigger.INSTANCE.trigger((EntityPlayerMP) entitylivingbase, this, source); } playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); diff --git a/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json b/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json index 4bb99369a..ac82dabab 100644 --- a/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json +++ b/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json @@ -13,10 +13,9 @@ "frame": "challenge" }, "parent": "botania:challenge/root", - "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", "criteria": { - "code_triggered": { - "trigger": "minecraft:impossible" + "no_armor": { + "trigger": "botania:gaia_guardian_no_armor" } } } \ No newline at end of file