diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 983064576..57d193f98 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -13,7 +13,9 @@ package vazkii.botania.common.block.tile.corporea; import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; @@ -29,6 +31,8 @@ import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.MathHelper; +import vazkii.botania.common.core.helper.PlayerHelper; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Collections; @@ -265,6 +269,9 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ index.doCorporeaRequest(name, count, spark); event.getPlayer().sendMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + if(CorporeaHelper.lastRequestExtractions >= 50000) { + PlayerHelper.grantCriterion(event.getPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/super_corporea_request"), "code_triggered"); + } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 18758743f..aae7df756 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -76,6 +76,7 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibEntityNames; @@ -435,6 +436,9 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public void onDeath(@Nonnull DamageSource source) { super.onDeath(source); EntityLivingBase entitylivingbase = getAttackingEntity(); + if(entitylivingbase instanceof EntityPlayerMP && !anyWithArmor) { + PlayerHelper.grantCriterion((EntityPlayerMP) entitylivingbase, new ResourceLocation(LibMisc.MOD_ID, "challenge/gaia_guardian_no_armor"), "code_triggered"); + } playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index d54c4cc27..3a8b462ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -17,6 +17,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -27,6 +28,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; 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; @@ -42,8 +44,10 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; +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.List; @@ -95,7 +99,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet 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"); stack.shrink(1); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 74269872b..a18785dc5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -91,6 +91,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { 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"); + } } else { player.swingArm(hand); player.motionX -= burst.motionX * 0.1; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 64c89ea6d..c3c309ed1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -14,19 +14,23 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; @@ -46,18 +50,18 @@ public class ItemPinkinator extends ItemMod { int range = 16; List withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityWither wither : withers) - if(!wither.isDead && !(wither instanceof EntityPinkWither)) { - if(!world.isRemote) { - wither.setDead(); - EntityPinkWither pink = new EntityPinkWither(world); - pink.setLocationAndAngles(wither.posX, wither.posY, wither.posZ, wither.rotationYaw, wither.rotationPitch); - pink.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pink)), null); - world.spawnEntity(pink); - pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - } - - world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); + if(!world.isRemote && !wither.isDead && !(wither instanceof EntityPinkWither)) { + wither.setDead(); + EntityPinkWither pink = new EntityPinkWither(world); + pink.setLocationAndAngles(wither.posX, wither.posY, wither.posZ, wither.rotationYaw, wither.rotationPitch); + pink.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pink)), null); + world.spawnEntity(pink); + pink.spawnExplosionParticle(); + pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); stack.shrink(1); + + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/pinkinator"), "code_triggered"); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } 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 b5e5fcfe2..e7f5b3f55 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -141,6 +141,10 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr if(SubTileFunctional.class.isAssignableFrom(subtile)) { PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "main/functional_flower"), "code_triggered"); } + + if("".equals(type)) { + PlayerHelper.grantCriterion((EntityPlayerMP) evt.getEntityPlayer(), new ResourceLocation(LibMisc.MOD_ID, "challenge/null_flower"), "code_triggered"); + } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index f912a5b00..89be29c81 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -17,6 +17,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -40,6 +41,7 @@ import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; 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.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -47,6 +49,7 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Arrays; @@ -187,6 +190,10 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ Vec3i endDiff = new Vec3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, null, MATERIALS, silk, fortune, isTipped(stack)); + + if(origLevel == 5) { + PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "challenge/rank_ss_pick"), "code_triggered"); + } } @Override diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index 01d5c0fd4..324442bd9 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -10,6 +10,8 @@ */ package vazkii.botania.common.lexicon; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.util.ResourceLocation; @@ -37,10 +39,9 @@ public class RelicLexiconEntry extends BasicLexiconEntry { if(a == null || player.capabilities.isCreativeMode) { return true; } else { - /*Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a); + Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a); AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(adv); - return progress.isDone();*/ - return false; // todo 1.12 + return progress != null && progress.isDone(); } } diff --git a/src/main/resources/META-INF/botania_at.cfg b/src/main/resources/META-INF/botania_at.cfg index bfef323f6..756ba70a5 100644 --- a/src/main/resources/META-INF/botania_at.cfg +++ b/src/main/resources/META-INF/botania_at.cfg @@ -45,3 +45,5 @@ 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 public net.minecraft.item.ItemTool field_77862_b # toolMaterial + +public net.minecraft.client.multiplayer.ClientAdvancementManager field_192803_d # advancementToProgress diff --git a/src/main/resources/assets/botania/advancements/challenge/desu_gun.json b/src/main/resources/assets/botania/advancements/challenge/desu_gun.json new file mode 100644 index 000000000..c2996306f --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/desu_gun.json @@ -0,0 +1,21 @@ +{ + "display": { + "icon": { + "item": "botania:manaGun", + "nbt": "{\"display\": { \"Name\": \"desu gun\" }}" + }, + "title": { + "translate": "advancement.botania:desuGun" + }, + "description": { + "translate": "advancement.botania:desuGun.desc" + } + }, + "parent": "botania:challenge/root", + "__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/challenge/gaia_guardian_no_armor.json b/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json new file mode 100644 index 000000000..69155bc7a --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/gaia_guardian_no_armor.json @@ -0,0 +1,21 @@ +{ + "display": { + "icon": { + "item": "minecraft:skull", + "data": 3 + }, + "title": { + "translate": "advancement.botania:gaiaGuardianNoArmor" + }, + "description": { + "translate": "advancement.botania:gaiaGuardianNoArmor.desc" + } + }, + "parent": "botania:challenge/root", + "__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/challenge/l20_shard_use.json b/src/main/resources/assets/botania/advancements/challenge/l20_shard_use.json new file mode 100644 index 000000000..aaa80bda8 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/l20_shard_use.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:laputashard" + }, + "title": { + "translate": "advancement.botania:l20ShardUse" + }, + "description": { + "translate": "advancement.botania:l20ShardUse.desc" + } + }, + "parent": "botania:challenge/root", + "__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/challenge/null_flower.json b/src/main/resources/assets/botania/advancements/challenge/null_flower.json new file mode 100644 index 000000000..9dcca3f43 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/null_flower.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:specialFlower" + }, + "title": { + "translate": "advancement.botania:nullFlower" + }, + "description": { + "translate": "advancement.botania:nullFlower.desc" + } + }, + "parent": "botania:challenge/root", + "__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/challenge/pinkinator.json b/src/main/resources/assets/botania/advancements/challenge/pinkinator.json new file mode 100644 index 000000000..580057275 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/pinkinator.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:pinkinator" + }, + "title": { + "translate": "advancement.botania:pinkinator" + }, + "description": { + "translate": "advancement.botania:pinkinator.desc" + } + }, + "parent": "botania:challenge/root", + "__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/challenge/rank_ss_pick.json b/src/main/resources/assets/botania/advancements/challenge/rank_ss_pick.json new file mode 100644 index 000000000..2c917c000 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/rank_ss_pick.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:terrapick" + }, + "title": { + "translate": "advancement.botania:rankSSPick" + }, + "description": { + "translate": "advancement.botania:rankSSPick.desc" + } + }, + "parent": "botania:challenge/root", + "__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/challenge/root.json b/src/main/resources/assets/botania/advancements/challenge/root.json new file mode 100644 index 000000000..b95881022 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/root.json @@ -0,0 +1,28 @@ +{ + "display": { + "icon": { + "item": "botania:dice" + }, + "title": { + "translate": "advancement.botania_challenge" + }, + "description": { + "translate": "advancement.botania_challenge.desc" + }, + "background": "botania:textures/blocks/livingrock1.png", + "show_toast": false, + "announce_to_chat": false + }, + "criteria": { + "flower": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "botania:flower" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json b/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json new file mode 100644 index 000000000..ff9ea2862 --- /dev/null +++ b/src/main/resources/assets/botania/advancements/challenge/super_corporea_request.json @@ -0,0 +1,20 @@ +{ + "display": { + "icon": { + "item": "botania:corporeaindex" + }, + "title": { + "translate": "advancement.botania:superCorporeaRequest" + }, + "description": { + "translate": "advancement.botania:superCorporeaRequest.desc" + } + }, + "parent": "botania:challenge/root", + "__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/root.json b/src/main/resources/assets/botania/advancements/main/root.json index 5ce661224..a2b760905 100644 --- a/src/main/resources/assets/botania/advancements/main/root.json +++ b/src/main/resources/assets/botania/advancements/main/root.json @@ -9,7 +9,7 @@ "description": { "translate": "botania.desc" }, - "background": "minecraft:textures/gui/advancements/backgrounds/stone.png", + "background": "botania:textures/blocks/livingwood0.png", "show_toast": false, "announce_to_chat": false }, diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 9c560f9dc..7628dba9b 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -8,6 +8,8 @@ # MISC itemGroup.botania=Botania +botania.desc=Botania description here. + generator.botania-skyblock=Garden of Glass generator.botania-skyblock.info=Not recommended for botania newcomers @@ -467,6 +469,8 @@ entity.botania:babylonWeapon.name=Treasury Weapon entity.botania:fallingStar.name=Falling Star # ADVANCEMENT NAMES + DESC +advancement.botania_challenge=Botania Challenges +advancement.botania_challenge.desc=Challenges for the advanced botanist advancement.botania:flowerPickup=Sky of Beginning advancement.botania:flowerPickup.desc=Pick up a Mystical Flower from the world advancement.botania:lexiconUse=A Realistical Logical Ideologist