Use a criterion trigger for relic binding instead of simple pickup, so the advancement isn't granted to people who pickup others' relics

This commit is contained in:
Vincent Lee committed 2017-07-30 18:11:15 -05:00
1 parent 2dc50866a1
commit c8f137eccf
10 files changed
+147 -45

No files matched your search

@@ -43,6 +43,7 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.ITwoNamedPage;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.common.advancements.RelicBindTrigger;
import vazkii.botania.common.block.ModBanners;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
@@ -135,6 +136,8 @@ public class Botania {
if(Botania.gardenOfGlassLoaded)
new WorldTypeSkyblock();
CriteriaTriggers.register(RelicBindTrigger.INSTANCE);
proxy.preInit(event);
}
@@ -0,0 +1,111 @@
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.ItemPredicate;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class RelicBindTrigger implements ICriterionTrigger<RelicBindTrigger.Instance> {
public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "relic_bind");
public static final RelicBindTrigger INSTANCE = new RelicBindTrigger();
private final Map<PlayerAdvancements, PlayerTracker> playerTrackers = new HashMap<>();
private RelicBindTrigger() {}
@Nonnull
@Override
public ResourceLocation getId() {
return ID;
}
@Override
public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<RelicBindTrigger.Instance> listener) {
this.playerTrackers.computeIfAbsent(player, PlayerTracker::new).listeners.add(listener);
}
@Override
public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<RelicBindTrigger.Instance> listener) {
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 playerAdvancementsIn) {
playerTrackers.remove(playerAdvancementsIn);
}
@Nonnull
@Override
public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) {
return new Instance(ItemPredicate.deserialize(json.get("relic")));
}
static class PlayerTracker {
private final PlayerAdvancements playerAdvancements;
final Set<Listener<Instance>> listeners = new HashSet<>();
PlayerTracker(PlayerAdvancements playerAdvancementsIn) {
this.playerAdvancements = playerAdvancementsIn;
}
public void trigger(ItemStack stack) {
List<Listener<Instance>> list = new ArrayList<>();
for(Listener<RelicBindTrigger.Instance> listener : this.listeners) {
if(listener.getCriterionInstance().test(stack)) {
list.add(listener);
}
}
for(Listener<RelicBindTrigger.Instance> listener : list) {
listener.grantCriterion(this.playerAdvancements);
}
}
}
public void trigger(EntityPlayerMP player, ItemStack relic) {
PlayerTracker tracker = playerTrackers.get(player.getAdvancements());
if(tracker != null) {
tracker.trigger(relic);
}
}
static class Instance implements ICriterionInstance {
private final ItemPredicate predicate;
Instance(ItemPredicate predicate) {
this.predicate = predicate;
}
@Nonnull
@Override
public ResourceLocation getId() {
return ID;
}
boolean test(ItemStack stack) {
return predicate.test(stack);
}
}
}
@@ -16,16 +16,17 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IRelic;
import vazkii.botania.common.advancements.RelicBindTrigger;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.item.ModItems;
@@ -36,7 +37,6 @@ import java.util.UUID;
public class ItemRelic extends ItemMod implements IRelic {
private static final String TAG_SOULBIND_NAME = "soulbind";
private static final String TAG_SOULBIND_UUID = "soulbindUUID";
public ItemRelic(String name) {
@@ -88,7 +88,7 @@ public class ItemRelic extends ItemMod implements IRelic {
return Integer.MAX_VALUE;
}
static void addStringToTooltip(String s, List<String> tooltip) {
private static void addStringToTooltip(String s, List<String> tooltip) {
tooltip.add(s.replaceAll("&", "\u00a7"));
}
@@ -100,6 +100,8 @@ public class ItemRelic extends ItemMod implements IRelic {
if(!hasUUID(stack)) {
bindToUUID(player.getUniqueID(), stack);
if(player instanceof EntityPlayerMP)
RelicBindTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack);
} else if (!getSoulbindUUID(stack).equals(player.getUniqueID())) {
rightPlayer = false;
}