From c8f137eccf6df486e726cbd4502e561e42a60406 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 30 Jul 2017 18:11:15 -0500 Subject: [PATCH] Use a criterion trigger for relic binding instead of simple pickup, so the advancement isn't granted to people who pickup others' relics --- .../java/vazkii/botania/common/Botania.java | 3 + .../common/advancements/RelicBindTrigger.java | 111 ++++++++++++++++++ .../botania/common/item/relic/ItemRelic.java | 8 +- .../advancements/challenge/aesir_ring.json | 10 +- .../advancements/challenge/flugel_eye.json | 10 +- .../challenge/infinite_fruit.json | 10 +- .../advancements/challenge/king_key.json | 10 +- .../advancements/challenge/loki_ring.json | 10 +- .../advancements/challenge/odin_ring.json | 10 +- .../advancements/challenge/thor_ring.json | 10 +- 10 files changed, 147 insertions(+), 45 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index dc3be3763..c103a3c22 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -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); } diff --git a/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java b/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java new file mode 100644 index 000000000..e2267093a --- /dev/null +++ b/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java @@ -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 { + public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "relic_bind"); + public static final RelicBindTrigger INSTANCE = new RelicBindTrigger(); + private final Map playerTrackers = new HashMap<>(); + + private RelicBindTrigger() {} + + @Nonnull + @Override + public ResourceLocation getId() { + return ID; + } + + @Override + public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { + this.playerTrackers.computeIfAbsent(player, PlayerTracker::new).listeners.add(listener); + } + + @Override + public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener 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> listeners = new HashSet<>(); + + PlayerTracker(PlayerAdvancements playerAdvancementsIn) { + this.playerAdvancements = playerAdvancementsIn; + } + + public void trigger(ItemStack stack) { + List> list = new ArrayList<>(); + + for(Listener listener : this.listeners) { + if(listener.getCriterionInstance().test(stack)) { + list.add(listener); + } + } + + for(Listener 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); + } + } +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 3d84a0d14..c95b46f6b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -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 tooltip) { + private static void addStringToTooltip(String s, List 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; } diff --git a/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json b/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json index 7698f8fbc..03d381737 100644 --- a/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json +++ b/src/main/resources/assets/botania/advancements/challenge/aesir_ring.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "ring": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:aesirring" - } - ] + "relic": { + "item": "botania:aesirring" + } } } } diff --git a/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json b/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json index 9d6e89bb2..5dc7ea4c1 100644 --- a/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json +++ b/src/main/resources/assets/botania/advancements/challenge/flugel_eye.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "eye": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:flugeleye" - } - ] + "relic": { + "item": "botania:flugeleye" + } } } } diff --git a/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json b/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json index b81ca1657..8d28d119b 100644 --- a/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json +++ b/src/main/resources/assets/botania/advancements/challenge/infinite_fruit.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "fruit": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:infinitefruit" - } - ] + "relic": { + "item": "botania:infinitefruit" + } } } } diff --git a/src/main/resources/assets/botania/advancements/challenge/king_key.json b/src/main/resources/assets/botania/advancements/challenge/king_key.json index d17a750be..2163cb0f3 100644 --- a/src/main/resources/assets/botania/advancements/challenge/king_key.json +++ b/src/main/resources/assets/botania/advancements/challenge/king_key.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "key": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:kingkey" - } - ] + "relic": { + "item": "botania:kingkey" + } } } } diff --git a/src/main/resources/assets/botania/advancements/challenge/loki_ring.json b/src/main/resources/assets/botania/advancements/challenge/loki_ring.json index 33e01361a..5b555f327 100644 --- a/src/main/resources/assets/botania/advancements/challenge/loki_ring.json +++ b/src/main/resources/assets/botania/advancements/challenge/loki_ring.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "ring": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:lokiring" - } - ] + "relic": { + "item": "botania:lokiring" + } } } } diff --git a/src/main/resources/assets/botania/advancements/challenge/odin_ring.json b/src/main/resources/assets/botania/advancements/challenge/odin_ring.json index 90e9e1ee8..a1ec3fcb2 100644 --- a/src/main/resources/assets/botania/advancements/challenge/odin_ring.json +++ b/src/main/resources/assets/botania/advancements/challenge/odin_ring.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "ring": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:odinring" - } - ] + "relic": { + "item": "botania:odinring" + } } } } diff --git a/src/main/resources/assets/botania/advancements/challenge/thor_ring.json b/src/main/resources/assets/botania/advancements/challenge/thor_ring.json index 035e7ad04..d5924799b 100644 --- a/src/main/resources/assets/botania/advancements/challenge/thor_ring.json +++ b/src/main/resources/assets/botania/advancements/challenge/thor_ring.json @@ -14,13 +14,11 @@ "parent": "botania:challenge/root", "criteria": { "ring": { - "trigger": "minecraft:inventory_changed", + "trigger": "botania:relic_bind", "conditions": { - "items": [ - { - "item": "botania:thorring" - } - ] + "relic": { + "item": "botania:thorring" + } } } }