From 7b8ce2e901f9eae9667b7f850e1b872982fbced1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 24 Nov 2017 12:52:08 -0600 Subject: [PATCH] Move corporea index advancement to trigger --- .../java/vazkii/botania/common/Botania.java | 2 + .../advancements/CorporeaRequestTrigger.java | 106 ++++++++++++++++++ .../tile/corporea/TileCorporeaIndex.java | 8 +- .../challenge/super_corporea_request.json | 10 +- 4 files changed, 117 insertions(+), 9 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 6ab5bf347..b780966e1 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -44,6 +44,7 @@ import vazkii.botania.api.lexicon.ITwoNamedPage; 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.RelicBindTrigger; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; @@ -138,6 +139,7 @@ public class Botania { new WorldTypeSkyblock(); CriteriaTriggers.register(AlfPortalTrigger.INSTANCE); + CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE); CriteriaTriggers.register(RelicBindTrigger.INSTANCE); proxy.preInit(event); diff --git a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java new file mode 100644 index 000000000..2ccf12040 --- /dev/null +++ b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java @@ -0,0 +1,106 @@ +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.LocationPredicate; +import net.minecraft.advancements.critereon.MinMaxBounds; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldServer; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +public class CorporeaRequestTrigger implements ICriterionTrigger { + public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "corporea_index_request"); + public static final CorporeaRequestTrigger INSTANCE = new CorporeaRequestTrigger(); + private final Map playerTrackers = new HashMap<>(); + + private CorporeaRequestTrigger() {} + + @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 player) { + playerTrackers.remove(player); + } + + @Nonnull + @Override + public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + return new Instance(MinMaxBounds.deserialize(json.get("extracted")), LocationPredicate.deserialize(json.get("location"))); + } + + static class PlayerTracker { + private final PlayerAdvancements playerAdvancements; + final Set> listeners = new HashSet<>(); + + PlayerTracker(PlayerAdvancements playerAdvancementsIn) { + this.playerAdvancements = playerAdvancementsIn; + } + + public void trigger(WorldServer world, BlockPos pos, int count) { + this.listeners.stream() + .filter(l -> l.getCriterionInstance().test(world, pos, count)) + .forEach(l -> l.grantCriterion(this.playerAdvancements)); + } + } + + public void trigger(EntityPlayerMP player, WorldServer world, BlockPos pos, int count) { + PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); + if(tracker != null) { + tracker.trigger(world, pos, count); + } + } + + static class Instance implements ICriterionInstance { + private final MinMaxBounds count; + private final LocationPredicate indexPos; + + Instance(MinMaxBounds count, LocationPredicate indexPos) { + this.count = count; + this.indexPos = indexPos; + } + + @Nonnull + @Override + public ResourceLocation getId() { + return ID; + } + + boolean test(WorldServer world, BlockPos pos, int count) { + return this.count.test(count) && this.indexPos.test(world, pos.getX(), pos.getY(), pos.getZ()); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 13d56c340..d95a01aa0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -29,6 +29,7 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; +import vazkii.botania.common.advancements.CorporeaRequestTrigger; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.lib.LibMisc; @@ -253,9 +254,6 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ if(!nearbyIndexes.isEmpty()) { String msg = event.getMessage().toLowerCase().trim(); for(TileCorporeaIndex index : nearbyIndexes) { - if(index.world.isRemote) - continue; - ICorporeaSpark spark = index.getSpark(); if(spark != null) { String name = ""; @@ -279,9 +277,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ index.doCorporeaRequest(name, count, spark); event.getPlayer().sendMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); - if(CorporeaHelper.lastRequestExtractions >= 50000) { - PlayerHelper.grantCriterion(event.getPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/super_corporea_request"), "code_triggered"); - } + CorporeaRequestTrigger.INSTANCE.trigger(event.getPlayer(), event.getPlayer().getServerWorld(), index.getPos(), CorporeaHelper.lastRequestExtractions); } } diff --git a/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json b/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json index 8947bd235..c8cb66a9a 100644 --- a/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json +++ b/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json @@ -12,10 +12,14 @@ "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" + "over_fifty_thousand": { + "trigger": "botania:corporea_index_request", + "conditions": { + "extracted": { + "min": 50000 + } + } } } } \ No newline at end of file