From 27d66c18ba8994b5a3cabcfdf79db1461af21a07 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 1 Jul 2017 22:16:56 -0500 Subject: [PATCH] Fix code granting of criterion for last commit --- .../java/vazkii/botania/common/Botania.java | 6 -- .../UseLexiconTrigger.java | 101 ------------------ .../common/block/tile/TileTinyPotato.java | 2 +- .../botania/common/item/ItemLexicon.java | 4 +- .../botania/common/item/ItemManaGun.java | 2 +- .../botania/common/item/ItemTwigWand.java | 2 +- .../item/block/ItemBlockSpecialFlower.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 2 +- .../advancements/main/lexicon_use.json | 5 +- 9 files changed, 11 insertions(+), 117 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/advancement_triggers/UseLexiconTrigger.java diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 57a3626f7..ccd5e1f36 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -43,7 +43,6 @@ 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.advancement_triggers.UseLexiconTrigger; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModMultiblocks; @@ -147,11 +146,6 @@ public class Botania { ModManaInfusionRecipes.init(); ModElvenTradeRecipes.init(); ModBrewRecipes.init(); - try { - ReflectionHelper.findMethod(CriteriaTriggers.class, "register", "", ICriterionTrigger.class).invoke(null, UseLexiconTrigger.INSTANCE); // todo 1.12 stop lazy use AT - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); - } // LexiconData.init(); todo 1.12 NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); diff --git a/src/main/java/vazkii/botania/common/advancement_triggers/UseLexiconTrigger.java b/src/main/java/vazkii/botania/common/advancement_triggers/UseLexiconTrigger.java deleted file mode 100644 index 105ce45ee..000000000 --- a/src/main/java/vazkii/botania/common/advancement_triggers/UseLexiconTrigger.java +++ /dev/null @@ -1,101 +0,0 @@ -package vazkii.botania.common.advancement_triggers; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; -import net.minecraft.advancements.critereon.AbstractCriterionInstance; -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.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - -public class UseLexiconTrigger implements ICriterionTrigger { - public static final UseLexiconTrigger INSTANCE = new UseLexiconTrigger(); - private static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "use_lexicon"); - private final Map listeners = new HashMap<>(); - - private UseLexiconTrigger() {} - - @Nonnull - @Override - public ResourceLocation getId() { - return ID; - } - - @Override - public void addListener(@Nonnull PlayerAdvancements advancements, @Nonnull Listener listener) { - listeners.computeIfAbsent(advancements, ListenerSet::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements advancements, @Nonnull Listener listener) { - if (listeners.containsKey(advancements)) { - listeners.get(advancements).listeners.remove(listener); - - if (listeners.get(advancements).listeners.isEmpty()) { - listeners.remove(advancements); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements advancements) { - listeners.remove(advancements); - } - - @Nonnull - @Override - public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new Instance(ItemPredicate.deserialize(json.get("item"))); - } - - public void trigger(EntityPlayerMP player, ItemStack lexicon) { - ListenerSet set = listeners.get(player.getAdvancements()); - if(set != null) { - set.trigger(player, lexicon); - } - } - - public static class Instance extends AbstractCriterionInstance { - private final ItemPredicate item; - - public Instance(ItemPredicate item) { - super(ID); - this.item = item; - } - - public boolean test(ItemStack lexicon) { - return item.test(lexicon); - } - } - - public static class ListenerSet { - private final PlayerAdvancements advancements; - private final Set> listeners = new HashSet<>(); - - public ListenerSet(PlayerAdvancements advancements) { - this.advancements = advancements; - } - - public void trigger(EntityPlayerMP player, ItemStack lexicon) { - List> toTrigger = listeners.stream() - .filter(l -> l.getCriterionInstance().test(lexicon)) - .collect(Collectors.toList()); - - for (ICriterionTrigger.Listener listener : toTrigger) { - listener.grantCriterion(advancements); - } - } - } - -} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index c9ece8585..ca02c50b5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -70,7 +70,7 @@ public class TileTinyPotato extends TileSimpleInventory { } } - PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/just_be_friends"), "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/tiny_potato_pet"), "code_triggered"); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index ad72932c7..365c3babe 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -28,6 +28,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -46,7 +47,6 @@ 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.advancement_triggers.UseLexiconTrigger; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -185,7 +185,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); - UseLexiconTrigger.INSTANCE.trigger((EntityPlayerMP) player, stack); + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/lexicon_use"), "code_triggered"); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 31572af90..74269872b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -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.spawnEntity(burst); - PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/maider_stranded_girl"), "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/mana_blaster_shoot"), "code_triggered"); } else { player.swingArm(hand); player.motionX -= burst.motionX * 0.1; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index d41e6beea..5a70dabc4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -121,7 +121,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(!world.isRemote) { world.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); world.playSound(null, pos, ModSounds.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); - PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/odds_and_ends"), "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/enchanter_make"), "code_triggered"); } else { for(int i = 0; i < 50; i++) { float red = (float) Math.random(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index c8c71e911..b5e5fcfe2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -135,11 +135,11 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr Class subtile = BotaniaAPI.getSubTileMapping(type); if(SubTileGenerating.class.isAssignableFrom(subtile)) { - PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/electric_magic"), "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/generating_flower"), "code_triggered"); } if(SubTileFunctional.class.isAssignableFrom(subtile)) { - PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/ecstatic_vivace"), "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered"); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index be96aa327..a0ce1b06b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -81,7 +81,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt baubles.setStackInSlot(i, toEquip); stack.shrink(1); - PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/inner_arts"), "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/bauble_wear"), "code_triggered"); if(!stackInSlot.isEmpty()) { ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player); diff --git a/src/main/resources/assets/botania/advancements/main/lexicon_use.json b/src/main/resources/assets/botania/advancements/main/lexicon_use.json index ade3b0c22..eba0ff1d4 100644 --- a/src/main/resources/assets/botania/advancements/main/lexicon_use.json +++ b/src/main/resources/assets/botania/advancements/main/lexicon_use.json @@ -11,9 +11,10 @@ } }, "parent": "botania:main/root", + "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", "criteria": { - "open": { - "trigger": "botania:use_lexicon" + "code_triggered": { + "trigger": "minecraft:impossible" } } } \ No newline at end of file