diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index d9b405550..57a3626f7 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.advancements.ICriterionTrigger; import net.minecraft.entity.Entity; import net.minecraft.entity.MultiPartEntityPart; import net.minecraft.entity.boss.EntityDragon; @@ -34,12 +36,14 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; 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; @@ -85,6 +89,8 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; +import java.lang.reflect.InvocationTargetException; + @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { @@ -141,6 +147,11 @@ 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 new file mode 100644 index 000000000..105ce45ee --- /dev/null +++ b/src/main/java/vazkii/botania/common/advancement_triggers/UseLexiconTrigger.java @@ -0,0 +1,101 @@ +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/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 649bae0f1..ad72932c7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -19,6 +19,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -45,6 +46,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.advancement_triggers.UseLexiconTrigger; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -180,8 +182,11 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { Botania.proxy.setLexiconStack(stack); player.openGui(Botania.instance, LibGuiIDs.LEXICON, world, 0, 0, 0); - if(!world.isRemote && !skipSound) - world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F); + 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); + } } @Override 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 2607261e5..b42bf01ba 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -10,22 +10,36 @@ */ package vazkii.botania.common.item.block; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementManager; +import net.minecraft.advancements.PlayerAdvancements; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.api.subtile.signature.SubTileSignature; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -36,6 +50,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; +@Mod.EventBusSubscriber public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { @@ -112,4 +127,28 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr return "flower." + getType(stack); } + @SubscribeEvent + public static void onItemPickup(EntityItemPickupEvent evt) { + if(evt.getItem().getItem().getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) { + PlayerAdvancements advancements = ((EntityPlayerMP) evt.getEntityPlayer()).getAdvancements(); + AdvancementManager manager = ((WorldServer) evt.getEntity().getEntityWorld()).getAdvancementManager(); + + String type = getType(evt.getItem().getItem()); + Class subtile = BotaniaAPI.getSubTileMapping(type); + Advancement adv = null; + + if(SubTileGenerating.class.isAssignableFrom(subtile)) { + adv = manager.getAdvancement(new ResourceLocation(LibMisc.MOD_ID, "main/electric_magic")); + } + + if(SubTileFunctional.class.isAssignableFrom(subtile)) { + // todo the other one + } + + if(adv != null) { + advancements.grantCriterion(adv, "code_triggered"); + } + } + } + } diff --git a/src/main/resources/META-INF/botania_at.cfg b/src/main/resources/META-INF/botania_at.cfg index 19c6edbec..b2a9fbc13 100644 --- a/src/main/resources/META-INF/botania_at.cfg +++ b/src/main/resources/META-INF/botania_at.cfg @@ -41,3 +41,5 @@ public net.minecraft.tileentity.MobSpawnerBaseLogic field_98282_f # spawnData public net.minecraft.client.gui.GuiIngame field_92017_k # remainingHighlightTicks public net.minecraft.client.gui.GuiChat field_146415_a # inputField + +public net.minecraft.advancements.CriteriaTriggers func_192118_a(Lnet/minecraft/advancements/ICriterionTrigger;)Lnet/minecraft/advancements/ICriterionTrigger; # register diff --git a/src/main/resources/assets/botania/advancements/main/electric_magic.json b/src/main/resources/assets/botania/advancements/main/electric_magic.json new file mode 100644 index 000000000..996e29bd8 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/electric_magic.json @@ -0,0 +1,21 @@ +{ + "display": { + "icon": { + "item": "botania:specialFlower", + "nbt": "{\"type\": \"endoflame\"}" + }, + "title": { + "translate": "advancement.botania:daybloomPickup" + }, + "description": { + "translate": "advancement.botania:daybloomPickup.desc" + } + }, + "parent": "botania:main/realistical_logical_ideologist", + "__comment": "This is triggered by code in Botania. In the future, it may become data-driven", + "criteria": { + "code_triggered": { + "trigger": "minecraft:impossible" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/main/noisy_lover_soul.json b/src/main/resources/assets/botania/advancements/main/noisy_lover_soul.json new file mode 100644 index 000000000..afa35390e --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/noisy_lover_soul.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "botania:cacophonium" + }, + "title": { + "translate": "advancement.botania:cacophoniumCraft" + }, + "description": { + "translate": "advancement.botania:cacophoniumCraft.desc" + } + }, + "parent": "botania:main/root", + "criteria": { + "cacophonium": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:cacophonium" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/main/realistical_logical_ideologist.json b/src/main/resources/assets/botania/advancements/main/realistical_logical_ideologist.json new file mode 100644 index 000000000..ade3b0c22 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/realistical_logical_ideologist.json @@ -0,0 +1,19 @@ +{ + "display": { + "icon": { + "item": "botania:lexicon" + }, + "title": { + "translate": "advancement.botania:lexiconUse" + }, + "description": { + "translate": "advancement.botania:lexiconUse.desc" + } + }, + "parent": "botania:main/root", + "criteria": { + "open": { + "trigger": "botania:use_lexicon" + } + } +} \ No newline at end of file