diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 9111bdf04..ee31719bc 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -39,6 +39,7 @@ import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.advancements.AlfPortalTrigger; import vazkii.botania.common.advancements.CorporeaRequestTrigger; +import vazkii.botania.common.advancements.ManaGunTrigger; import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger; import vazkii.botania.common.advancements.RelicBindTrigger; import vazkii.botania.common.advancements.UseItemSuccessTrigger; @@ -211,6 +212,7 @@ public class Botania { CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE); CriteriaTriggers.register(RelicBindTrigger.INSTANCE); CriteriaTriggers.register(UseItemSuccessTrigger.INSTANCE); + CriteriaTriggers.register(ManaGunTrigger.INSTANCE); CraftingHelper.register(FluxfieldCondition.SERIALIZER); diff --git a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java new file mode 100644 index 000000000..3e8661d88 --- /dev/null +++ b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java @@ -0,0 +1,123 @@ +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.criterion.EntityPredicate; +import net.minecraft.advancements.criterion.ItemPredicate; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.common.item.ItemManaGun; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + +public class ManaGunTrigger implements ICriterionTrigger { + private static final ResourceLocation ID = prefix("fire_mana_blaster"); + + public static final ManaGunTrigger INSTANCE = new ManaGunTrigger(); + private final Map playerTrackers = new HashMap<>(); + + private ManaGunTrigger() {} + + @Nonnull + @Override + public ResourceLocation getId() { + return ID; + } + + @Override + public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { + this.playerTrackers.computeIfAbsent(player, ManaGunTrigger.PlayerTracker::new).listeners.add(listener); + } + + @Override + public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { + ManaGunTrigger.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 ManaGunTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + Boolean desu = json.get("desu") == null ? null : json.get("desu").getAsBoolean(); + return new ManaGunTrigger.Instance(ItemPredicate.deserialize(json.get("item")), EntityPredicate.deserialize(json.get("user")), desu); + } + + static class PlayerTracker { + private final PlayerAdvancements playerAdvancements; + final Set> listeners = new HashSet<>(); + + PlayerTracker(PlayerAdvancements playerAdvancementsIn) { + this.playerAdvancements = playerAdvancementsIn; + } + + public void trigger(ServerPlayerEntity player, ItemStack stack) { + List> list = new ArrayList<>(); + + for(Listener listener : this.listeners) { + if(listener.getCriterionInstance().test(stack, player)) { + list.add(listener); + } + } + + for(Listener listener : list) { + listener.grantCriterion(this.playerAdvancements); + } + } + } + + public void trigger(ServerPlayerEntity player, ItemStack stack) { + ManaGunTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); + if(tracker != null) { + tracker.trigger(player, stack); + } + } + + static class Instance implements ICriterionInstance { + private final ItemPredicate item; + private final EntityPredicate user; + @Nullable + private final Boolean desu; + + Instance(ItemPredicate count, EntityPredicate user, Boolean desu) { + this.item = count; + this.user = user; + this.desu = desu; + } + + @Nonnull + @Override + public ResourceLocation getId() { + return ID; + } + + boolean test(ItemStack stack, ServerPlayerEntity entity) { + return this.item.test(stack) && this.user.test(entity, entity) + && (desu == null || desu == ItemManaGun.isSugoiKawaiiDesuNe(stack)); + } + } +} diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 06ebd728a..e9c68ff7f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -38,7 +38,7 @@ 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.advancements.ManaGunTrigger; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityManaBurst; @@ -90,7 +90,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.addEntity(burst); - UseItemSuccessTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack, (ServerWorld) world, player.posX, player.posY, player.posZ); + ManaGunTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack); } else { player.swingArm(hand); player.setMotion(player.getMotion().subtract(burst.getMotion().mul(0.1, 0.3, 0.1))); diff --git a/src/main/resources/data/botania/advancements/challenge/desu_gun.json b/src/main/resources/data/botania/advancements/challenge/desu_gun.json index 306ba42f0..245f88868 100644 --- a/src/main/resources/data/botania/advancements/challenge/desu_gun.json +++ b/src/main/resources/data/botania/advancements/challenge/desu_gun.json @@ -15,12 +15,9 @@ "parent": "botania:challenge/root", "criteria": { "use_gun": { - "trigger": "botania:use_item_success", + "trigger": "botania:fire_mana_blaster", "conditions": { - "item": { - "item": "botania:mana_gun", - "nbt": "{\"display\": { \"Name\": \"desu gun\" }}" - } + "desu": true } } } diff --git a/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json b/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json index fa13bd81e..060ff6ab6 100644 --- a/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json +++ b/src/main/resources/data/botania/advancements/main/mana_blaster_shoot.json @@ -13,12 +13,7 @@ "parent": "botania:main/rune_pickup", "criteria": { "shoot": { - "trigger": "botania:use_item_success", - "conditions": { - "item": { - "item": "botania:mana_gun" - } - } + "trigger": "botania:fire_mana_blaster" } } } \ No newline at end of file