Move GG no armor to advancement

This commit is contained in:
Vincent Lee committed 2017-11-26 11:30:22 -06:00
1 parent 4daa5bee12
commit 794d0284d1
4 files changed
+115 -4

No files matched your search

@@ -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);
@@ -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<DopplegangerNoArmorTrigger.Instance> {
public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_no_armor");
public static final DopplegangerNoArmorTrigger INSTANCE = new DopplegangerNoArmorTrigger();
private final Map<PlayerAdvancements, PlayerTracker> playerTrackers = new HashMap<>();
private DopplegangerNoArmorTrigger() {}
@Nonnull
@Override
public ResourceLocation getId() {
return ID;
}
@Override
public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<DopplegangerNoArmorTrigger.Instance> listener) {
this.playerTrackers.computeIfAbsent(player, DopplegangerNoArmorTrigger.PlayerTracker::new).listeners.add(listener);
}
@Override
public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<DopplegangerNoArmorTrigger.Instance> 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<Listener<Instance>> listeners = new HashSet<>();
PlayerTracker(PlayerAdvancements playerAdvancementsIn) {
this.playerAdvancements = playerAdvancementsIn;
}
public void trigger(EntityPlayerMP player, EntityDoppleganger guardian, DamageSource src) {
List<Listener<Instance>> list = new ArrayList<>();
for(Listener<DopplegangerNoArmorTrigger.Instance> listener : this.listeners) {
if(listener.getCriterionInstance().test(player, guardian, src)) {
list.add(listener);
}
}
for(Listener<DopplegangerNoArmorTrigger.Instance> 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);
}
}
}
@@ -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);