diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 75720188e..60804950f 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -46,11 +46,15 @@ public final class ModAchievements { public static Achievement gaiaGuardianKill; public static Achievement spawnerMoverUse; public static Achievement tiaraWings; + public static Achievement enderAirMake; + public static Achievement corporeaCraft; public static Achievement signalFlareStun; public static Achievement l20ShardUse; public static Achievement gaiaGuardianNoArmor; public static Achievement rankSSPick; + public static Achievement superCorporeaRequest; + public static Achievement pinkinator; public static Achievement desuGun; @@ -76,6 +80,9 @@ public final class ModAchievements { kekimurusPickup = new AchievementMod(LibAchievementNames.KEKIMURUS_PICKUP, 3, 6, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS), elfPortalOpen); heiseiDreamPickup = new AchievementMod(LibAchievementNames.HEISEI_DREAM_PICKUP, 5, 6, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), elfPortalOpen); + enderAirMake = new AchievementMod(LibAchievementNames.ENDER_AIR_MAKE, 4, 8, new ItemStack(ModItems.manaResource, 1, 15), elfPortalOpen); + corporeaCraft = new AchievementMod(LibAchievementNames.CORPOREA_CRAFT, 2, 8, ModBlocks.corporeaFunnel, enderAirMake); + gaiaGuardianKill = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_KILL, 2, 4, new ItemStack(ModItems.manaResource, 1, 5), elfPortalOpen).setSpecial(); spawnerMoverUse = new AchievementMod(LibAchievementNames.SPAWNER_MOVER_USE, -1, 5, ModItems.spawnerMover, gaiaGuardianKill); @@ -85,6 +92,8 @@ public final class ModAchievements { l20ShardUse = new AchievementMod(LibAchievementNames.L20_SHARD_USE, -5, -1, ModItems.laputaShard, null).setSpecial(); gaiaGuardianNoArmor = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_NO_ARMOR, -5, -3, new ItemStack(Items.skull, 1, 3), null).setSpecial(); rankSSPick = new AchievementMod(LibAchievementNames.RANK_SS_PICK, -3, -1, ModItems.terraPick, null).setSpecial(); + superCorporeaRequest = new AchievementMod(LibAchievementNames.SUPER_CORPOREA_REQUEST, -3, -5, ModBlocks.corporeaIndex, null).setSpecial(); + pinkinator = new AchievementMod(LibAchievementNames.PINKINATOR, -5, -5, ModItems.pinkinator, null).setSpecial(); ItemStack desu = new ItemStack(ModItems.manaGun); desu.setStackDisplayName("desu gun"); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 72bb89c40..c950e49a1 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -15,14 +15,19 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.stats.Achievement; import net.minecraft.world.World; +import vazkii.botania.common.achievement.ICraftAchievement; +import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; -public abstract class BlockCorporeaBase extends BlockModContainer { +public abstract class BlockCorporeaBase extends BlockModContainer implements ICraftAchievement { Random random; @@ -71,4 +76,9 @@ public abstract class BlockCorporeaBase extends BlockModContainer= 50000) + event.player.addStat(ModAchievements.superCorporeaRequest, 1); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 435d21071..b551ed000 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -19,6 +19,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; @@ -43,7 +44,8 @@ public class ItemPinkinator extends ItemMod { world.spawnEntityInWorld(pink); world.playSoundAtEntity(wither, "random.explode", 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } - + player.addStat(ModAchievements.pinkinator, 1); + world.spawnParticle("hugeexplosion", wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); stack.stackSize--; return stack; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 23dc28ceb..7d860002b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -64,6 +64,8 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve if(rightEvent && correctStack && ender) { ItemStack stack1 = new ItemStack(this, 1, 15); + event.entityPlayer.addStat(ModAchievements.enderAirMake, 1); + if(!event.entityPlayer.inventory.addItemStackToInventory(stack1)) event.entityPlayer.dropPlayerItemWithRandomChoice(stack1, true); diff --git a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java index 9025f999c..4e1d13c55 100644 --- a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java @@ -32,11 +32,15 @@ public final class LibAchievementNames { public static final String HEISEI_DREAM_PICKUP = "heiseiDreamPickup"; public static final String DIRT_ROD_CRAFT = "dirtRodCraft"; public static final String SPAWNER_MOVER_USE = "spawnerMoverUse"; + public static final String ENDER_AIR_MAKE = "enderAirMake"; + public static final String CORPOREA_CRAFT = "corporeaCraft"; public static final String SIGNAL_FLARE_STUN = "signalFlareStun"; public static final String L20_SHARD_USE = "l20ShardUse"; public static final String GAIA_GUARDIAN_NO_ARMOR = "gaiaGuardianNoArmor"; public static final String RANK_SS_PICK = "rankSSPick"; + public static final String SUPER_CORPOREA_REQUEST = "superCorporeaRequest"; + public static final String PINKINATOR = "pinkinator"; public static final String DESU_GUN = "desuGun"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index e92505bce..3b8719a38 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -365,6 +365,11 @@ achievement.botania:dirtRodCraft=Rockbell achievement.botania:dirtRodCraft.desc=Craft a dirty sti- er... Rod of the Lands achievement.botania:spawnerMoverUse=I can take off my (redacted) achievement.botania:spawnerMoverUse.desc=Use a Life Aggregator to transport a Monster Spawner +achievement.botania:enderAirMake=Imitation Air +achievement.botania:enderAirMake.desc=Collect a Bottle of Ender Air +achievement.botania:corporeaCraft=Drop Pop Candy +achievement.botania:corporeaCraft.desc=Craft a block that makes use of the Corporea Network + achievement.botania:signalFlareStun=See the Lights achievement.botania:signalFlareStun.desc=Stun 100 or more mobs at once with a Signal Flare achievement.botania:l20ShardUse=Out of Step @@ -373,6 +378,11 @@ achievement.botania:gaiaGuardianNoArmor=Mythologia's End achievement.botania:gaiaGuardianNoArmor.desc=Slay a Gaia Guardian without wearing any armor at any point during the fight achievement.botania:rankSSPick=Talent Shredder achievement.botania:rankSSPick.desc=Dig through the world using a rank SS Terra Shatterer +achievement.botania:superCorporeaRequest=Invader Girl +achievement.botania:superCorporeaRequest.desc=Successfuly request 50,000 or more of a single item in a Corporea Index +achievement.botania:pinkinator=Decorator +achievement.botania:pinkinator.desc=Put to use The Pinkinator + achievement.botania:desuGun=Two-Faced Lovers achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN # ^ Don't localize