From f0e13b7d3b73afe5e490fcc2921fbaea5dd01dfe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 1 Jul 2017 16:28:50 -0500 Subject: [PATCH] More advancements --- .../common/block/tile/TileTinyPotato.java | 6 +++ .../common/core/helper/PlayerHelper.java | 15 +++++++ .../botania/common/item/ItemCraftingHalo.java | 1 - .../botania/common/item/ItemManaGun.java | 5 +++ .../botania/common/item/ItemTwigWand.java | 4 ++ .../item/block/ItemBlockSpecialFlower.java | 13 ++----- .../item/equipment/bauble/ItemBauble.java | 6 +++ .../advancements/main/childhood_blues.json | 39 +++++++++++++++++++ .../advancements/main/drop_pop_candy.json | 26 +++++++++++++ .../advancements/main/ecstatic_vivace.json | 21 ++++++++++ .../botania/advancements/main/inner_arts.json | 20 ++++++++++ .../advancements/main/just_be_friends.json | 20 ++++++++++ .../main/maider_stranded_girl.json | 20 ++++++++++ .../advancements/main/odds_and_ends.json | 20 ++++++++++ .../botania/advancements/main/rockbell.json | 26 +++++++++++++ .../main/world_domination_how_to.json | 26 +++++++++++++ 16 files changed, 257 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/botania/advancements/main/childhood_blues.json create mode 100644 src/main/resources/assets/botania/advancements/main/drop_pop_candy.json create mode 100644 src/main/resources/assets/botania/advancements/main/ecstatic_vivace.json create mode 100644 src/main/resources/assets/botania/advancements/main/inner_arts.json create mode 100644 src/main/resources/assets/botania/advancements/main/just_be_friends.json create mode 100644 src/main/resources/assets/botania/advancements/main/maider_stranded_girl.json create mode 100644 src/main/resources/assets/botania/advancements/main/odds_and_ends.json create mode 100644 src/main/resources/assets/botania/advancements/main/rockbell.json create mode 100644 src/main/resources/assets/botania/advancements/main/world_domination_how_to.json 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 a8b4ce146..c9ece8585 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,16 +11,20 @@ package vazkii.botania.common.block.tile; 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.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; +import vazkii.botania.common.core.helper.PlayerHelper; +import vazkii.botania.common.lib.LibMisc; public class TileTinyPotato extends TileSimpleInventory { @@ -65,6 +69,8 @@ public class TileTinyPotato extends TileSimpleInventory { return; } } + + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/just_be_friends"), "code_triggered"); } } diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index b9562b4c0..038deaad0 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -1,9 +1,15 @@ package vazkii.botania.common.core.helper; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementManager; +import net.minecraft.advancements.PlayerAdvancements; 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.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.WorldServer; import java.util.function.Predicate; @@ -98,5 +104,14 @@ public final class PlayerHelper { return false; } + public static void grantCriterion(EntityPlayerMP player, ResourceLocation advancementId, String criterion) { + PlayerAdvancements advancements = player.getAdvancements(); + AdvancementManager manager = player.getServerWorld().getAdvancementManager(); + Advancement advancement = manager.getAdvancement(advancementId); + if(advancement != null) { + advancements.grantCriterion(advancement, criterion); + } + } + private PlayerHelper() {} } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 73f534db2..03e5a4dc1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -52,7 +52,6 @@ import net.minecraftforge.items.ItemStackHandler; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; -import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 26fef7d1c..31572af90 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -18,6 +18,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -26,6 +27,7 @@ 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; @@ -39,8 +41,10 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; 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; @@ -86,6 +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"); } 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 05774b01b..d41e6beea 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.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.init.Blocks; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -49,8 +50,10 @@ import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.core.handler.ConfigHandler; 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.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.awt.Color; @@ -118,6 +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"); } 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 b42bf01ba..c8c71e911 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -45,6 +45,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -130,23 +131,15 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @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")); + PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/electric_magic"), "code_triggered"); } if(SubTileFunctional.class.isAssignableFrom(subtile)) { - // todo the other one - } - - if(adv != null) { - advancements.grantCriterion(adv, "code_triggered"); + PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/ecstatic_vivace"), "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 8355b4ceb..be96aa327 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 @@ -18,11 +18,13 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; 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.world.World; import net.minecraftforge.fml.common.Optional; @@ -34,8 +36,10 @@ import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; 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.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; @@ -77,6 +81,8 @@ 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"); + if(!stackInSlot.isEmpty()) { ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player); diff --git a/src/main/resources/assets/botania/advancements/main/childhood_blues.json b/src/main/resources/assets/botania/advancements/main/childhood_blues.json new file mode 100644 index 000000000..ca77661c7 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/childhood_blues.json @@ -0,0 +1,39 @@ +{ + "display": { + "icon": { + "item": "botania:brewery" + }, + "title": { + "translate": "advancement.botania:brewPickup" + }, + "description": { + "translate": "advancement.botania:brewPickup.desc" + } + }, + "parent": "botania:main/drop_pop_candy", + "criteria": { + "flask": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:brewflask" + } + ] + } + }, + "vial": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:brewvial" + } + ] + } + } + }, + "requirements": [ + [ "flask", "vial" ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/main/drop_pop_candy.json b/src/main/resources/assets/botania/advancements/main/drop_pop_candy.json new file mode 100644 index 000000000..0b43c9d91 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/drop_pop_candy.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "botania:runealtar" + }, + "title": { + "translate": "advancement.botania:runePickup" + }, + "description": { + "translate": "advancement.botania:runePickup.desc" + } + }, + "parent": "botania:main/vivid_wave", + "criteria": { + "rune": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:rune" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/main/ecstatic_vivace.json b/src/main/resources/assets/botania/advancements/main/ecstatic_vivace.json new file mode 100644 index 000000000..92f2047d6 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/ecstatic_vivace.json @@ -0,0 +1,21 @@ +{ + "display": { + "icon": { + "item": "botania:specialFlower", + "nbt": "{\"type\": \"pollidisiac\"}" + }, + "title": { + "translate": "advancement.botania:endoflamePickup" + }, + "description": { + "translate": "advancement.botania:endoflamePickup.desc" + } + }, + "parent": "botania:main/vivid_wave", + "__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/inner_arts.json b/src/main/resources/assets/botania/advancements/main/inner_arts.json new file mode 100644 index 000000000..ef862b98e --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/inner_arts.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:manaring" + }, + "title": { + "translate": "advancement.botania:baubleWear" + }, + "description": { + "translate": "advancement.botania:baubleWear.desc" + } + }, + "parent": "botania:main/vivid_wave", + "__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/just_be_friends.json b/src/main/resources/assets/botania/advancements/main/just_be_friends.json new file mode 100644 index 000000000..0a6a18cec --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/just_be_friends.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:tinypotato" + }, + "title": { + "translate": "advancement.botania:tinyPotatoPet" + }, + "description": { + "translate": "advancement.botania:tinyPotatoPet.desc" + } + }, + "parent": "botania:main/vivid_wave", + "__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/maider_stranded_girl.json b/src/main/resources/assets/botania/advancements/main/maider_stranded_girl.json new file mode 100644 index 000000000..1aa8b0431 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/maider_stranded_girl.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:managun" + }, + "title": { + "translate": "advancement.botania:manaBlasterShoot" + }, + "description": { + "translate": "advancement.botania:manaBlasterShoot.desc" + } + }, + "parent": "botania:main/drop_pop_candy", + "__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/odds_and_ends.json b/src/main/resources/assets/botania/advancements/main/odds_and_ends.json new file mode 100644 index 000000000..83c809572 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/odds_and_ends.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:enchanter" + }, + "title": { + "translate": "advancement.botania:enchanterMake" + }, + "description": { + "translate": "advancement.botania:enchanterMake.desc" + } + }, + "parent": "botania:main/vivid_wave", + "__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/rockbell.json b/src/main/resources/assets/botania/advancements/main/rockbell.json new file mode 100644 index 000000000..f4f367635 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/rockbell.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "botania:dirtrod" + }, + "title": { + "translate": "advancement.botania:dirtRodCraft" + }, + "description": { + "translate": "advancement.botania:dirtRodCraft.desc" + } + }, + "parent": "botania:main/drop_pop_candy", + "criteria": { + "dirtrod": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:dirtrod" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/main/world_domination_how_to.json b/src/main/resources/assets/botania/advancements/main/world_domination_how_to.json new file mode 100644 index 000000000..657f764f9 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/main/world_domination_how_to.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "botania:poolminecart" + }, + "title": { + "translate": "advancement.botania:manaCartCraft" + }, + "description": { + "translate": "advancement.botania:manaCartCraft.desc" + } + }, + "parent": "botania:main/vivid_wave", + "criteria": { + "poolcart": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:poolminecart" + } + ] + } + } + } +} \ No newline at end of file