mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 03:15:07 +00:00
Move corporea index advancement to trigger
This commit is contained in:
1 parent
ba8c4f8af4
commit
7b8ce2e901
4 files changed
+117
-9
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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<CorporeaRequestTrigger.Instance> {
|
||||
public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "corporea_index_request");
|
||||
public static final CorporeaRequestTrigger INSTANCE = new CorporeaRequestTrigger();
|
||||
private final Map<PlayerAdvancements, PlayerTracker> playerTrackers = new HashMap<>();
|
||||
|
||||
private CorporeaRequestTrigger() {}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ResourceLocation getId() {
|
||||
return ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<CorporeaRequestTrigger.Instance> listener) {
|
||||
this.playerTrackers.computeIfAbsent(player, PlayerTracker::new).listeners.add(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<CorporeaRequestTrigger.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 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<Listener<Instance>> 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());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user