Move a bunch of advancements to use_item_success trigger

This commit is contained in:
Vincent Lee committed 2017-11-26 11:30:22 -06:00
1 parent e068b4675b
commit 25ad5cc06f
13 files changed
+173 -36

No files matched your search

@@ -43,10 +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.AlfPortalTrigger;
import vazkii.botania.common.advancements.CorporeaRequestTrigger;
import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger;
import vazkii.botania.common.advancements.RelicBindTrigger;
import vazkii.botania.common.advancements.*;
import vazkii.botania.common.block.ModBanners;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModMultiblocks;
@@ -143,6 +140,7 @@ public class Botania {
CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE);
CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE);
CriteriaTriggers.register(RelicBindTrigger.INSTANCE);
CriteriaTriggers.register(UseItemSuccessTrigger.INSTANCE);
proxy.preInit(event);
}
@@ -0,0 +1,112 @@
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.advancements.critereon.LocationPredicate;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.WorldServer;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.*;
// Catch-all "used an item and it succeeded" trigger for Botania items, because making a separate
// trigger for each one is dumb.
public class UseItemSuccessTrigger implements ICriterionTrigger<UseItemSuccessTrigger.Instance> {
public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "use_item_success");
public static final UseItemSuccessTrigger INSTANCE = new UseItemSuccessTrigger();
private final Map<PlayerAdvancements, PlayerTracker> playerTrackers = new HashMap<>();
private UseItemSuccessTrigger() {}
@Nonnull
@Override
public ResourceLocation getId() {
return ID;
}
@Override
public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<UseItemSuccessTrigger.Instance> listener) {
this.playerTrackers.computeIfAbsent(player, UseItemSuccessTrigger.PlayerTracker::new).listeners.add(listener);
}
@Override
public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<UseItemSuccessTrigger.Instance> listener) {
UseItemSuccessTrigger.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 UseItemSuccessTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) {
return new UseItemSuccessTrigger.Instance(ItemPredicate.deserialize(json.get("item")), 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(EntityPlayerMP player, ItemStack stack, WorldServer world, double x, double y, double z) {
List<Listener<Instance>> list = new ArrayList<>();
for(Listener<UseItemSuccessTrigger.Instance> listener : this.listeners) {
if(listener.getCriterionInstance().test(stack, world, x, y, z)) {
list.add(listener);
}
}
for(Listener<UseItemSuccessTrigger.Instance> listener : list) {
listener.grantCriterion(this.playerAdvancements);
}
}
}
public void trigger(EntityPlayerMP player, ItemStack stack, WorldServer world, double x, double y, double z) {
UseItemSuccessTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements());
if(tracker != null) {
tracker.trigger(player, stack, world, x, y, z);
}
}
static class Instance implements ICriterionInstance {
private final ItemPredicate item;
private final LocationPredicate location;
Instance(ItemPredicate count, LocationPredicate indexPos) {
this.item = count;
this.location = indexPos;
}
@Nonnull
@Override
public ResourceLocation getId() {
return ID;
}
boolean test(ItemStack stack, WorldServer world, double x, double y, double z) {
return this.item.test(stack) && this.location.test(world, x, y, z);
}
}
}
@@ -33,6 +33,7 @@ import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.IManaBurst;
@@ -41,6 +42,7 @@ import vazkii.botania.api.mana.ILaputaImmobile;
import vazkii.botania.api.mana.ILensEffect;
import vazkii.botania.api.mana.ITinyPlanetExcempt;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
@@ -98,8 +100,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet
world.playSound(null, pos, ModSounds.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F);
ItemStack stack = player.getHeldItem(hand);
spawnBurstFirst(world, pos, stack);
if(stack.getItemDamage() == 19)
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/l20_shard_use"), "code_triggered");
UseItemSuccessTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack, (WorldServer) world, pos.getX(), pos.getY(), pos.getZ());
stack.shrink(1);
}
@@ -37,6 +37,7 @@ import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -47,6 +48,7 @@ import vazkii.botania.api.lexicon.KnowledgeType;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.common.Botania;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
@@ -185,7 +187,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
if(!world.isRemote) {
if(!skipSound)
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/lexicon_use"), "code_triggered");
UseItemSuccessTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack, (WorldServer) world, player.posX, player.posY, player.posZ);
}
}
@@ -27,10 +27,10 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -39,12 +39,11 @@ import vazkii.botania.api.mana.ILens;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@@ -90,10 +89,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
if(!world.isRemote) {
world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1);
world.spawnEntity(burst);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/mana_blaster_shoot"), "code_triggered");
if(isSugoiKawaiiDesuNe(stack)) {
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/desu_gun"), "code_triggered");
}
UseItemSuccessTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack, (WorldServer) world, player.posX, player.posY, player.posZ);
} else {
player.swingArm(hand);
player.motionX -= burst.motionX * 0.1;
@@ -25,8 +25,10 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.entity.EntityPinkWither;
import vazkii.botania.common.lib.LibItemNames;
@@ -58,10 +60,8 @@ public class ItemPinkinator extends ItemMod {
world.spawnEntity(pink);
pink.spawnExplosionParticle();
pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
UseItemSuccessTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack, (WorldServer) world, player.posX, player.posY, player.posZ);
stack.shrink(1);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/pinkinator"), "code_triggered");
return ActionResult.newResult(EnumActionResult.SUCCESS, stack);
}
@@ -28,10 +28,12 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.Botania;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -111,7 +113,7 @@ public class ItemSpawnerMover extends ItemMod {
tag.setInteger(TAG_PLACE_DELAY, 20);
itemstack.setTagCompound(tag);
world.setBlockToAir(pos);
PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/spawner_mover_use"), "code_triggered");
UseItemSuccessTrigger.INSTANCE.trigger((EntityPlayerMP) player, itemstack, (WorldServer) world, pos.getX(), pos.getY(), pos.getZ());
} else {
player.renderBrokenItemStack(itemstack);
for(int i = 0; i < 50; i++) {