New Cheeves! (More to come!)

src/main/java/ellpeck/actuallyadditions/achievement/TheAchievements.java

@@ -11,40 +11,17 @@
 package ellpeck.actuallyadditions.achievement;
 
 import ellpeck.actuallyadditions.blocks.InitBlocks;
-import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
 import ellpeck.actuallyadditions.items.InitItems;
-import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
 
 public enum TheAchievements{
 
-    //Special Stuff Path
-    PICK_UP_XP("pickUpSolidXP", 0, 0, new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()), null, InitAchievements.PICKUP_ACH),
-
-    //Food & Fertilizer Path
-    CRAFT_KNIFE_BLADE("craftKnifeBlade", 0, 2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), null),
-    CRAFT_KNIFE("craftKnife", 2, 2, new ItemStack(InitItems.itemKnife), CRAFT_KNIFE_BLADE.ach),
-    CRAFT_MASHED_FOOD("craftMashedFood", 4, 2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.MASHED_FOOD.ordinal()), CRAFT_KNIFE.ach),
-
-    //Machine Path
-    CRAFT_WOODEN_CASE("craftWoodenCasing", 0, -3, new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), null),
-    //ESD Part
-    CRAFT_ESD("craftESD", -2, -3, new ItemStack(InitBlocks.blockInputter), CRAFT_WOODEN_CASE.ach),
-    CRAFT_ADVANCED_ESD("craftAdvancedESD", -4, -3, new ItemStack(InitBlocks.blockInputterAdvanced), CRAFT_ESD.ach),
-
-    CRAFT_STONE_CASE("craftStoneCasing", 2, -4, new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), CRAFT_WOODEN_CASE.ach),
-    CRAFT_COIL("craftBasicCoil", 2, -2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), CRAFT_WOODEN_CASE.ach),
-    CRAFT_ADVANCED_COIL("craftAdvancedCoil", 4, -2, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), CRAFT_COIL.ach),
-    //Phantom Part
-    CRAFT_PHANTOMFACE("craftPhantomface", 6, -2, new ItemStack(InitBlocks.blockPhantomface), CRAFT_ADVANCED_COIL.ach),
-    CRAFT_ENERGYFACE("craftPhantomEnergyface", 8, -1, new ItemStack(InitBlocks.blockPhantomEnergyface), CRAFT_PHANTOMFACE.ach),
-    CRAFT_LIQUIFACE("craftPhantomLiquiface", 8, -3, new ItemStack(InitBlocks.blockPhantomLiquiface), CRAFT_PHANTOMFACE.ach),
-
-    //Misc Achievements
-    OPEN_TREASURE_CHEST("openTreasureChest", 0, 4, new ItemStack(InitBlocks.blockTreasureChest), null, InitAchievements.MISC_ACH);
+    OPEN_BOOKLET("openBooklet", 0, 0, new ItemStack(InitItems.itemLexicon), null, InitAchievements.MISC_ACH),
+    NAME_SMILEY_CLOUD("nameSmileyCloud", 2, 0, new ItemStack(InitBlocks.blockSmileyCloud), OPEN_BOOKLET.ach, InitAchievements.MISC_ACH),
+    CRAFT_PHANTOMFACE("craftPhantomface", -2, 0, new ItemStack(InitBlocks.blockPhantomface), OPEN_BOOKLET.ach),
+    OPEN_TREASURE_CHEST("openTreasureChest", 0, -2, new ItemStack(InitBlocks.blockTreasureChest), OPEN_BOOKLET.ach, InitAchievements.MISC_ACH);
 
     public final Achievement ach;
     public final int type;

src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java

@@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
+import ellpeck.actuallyadditions.achievement.TheAchievements;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
 import ellpeck.actuallyadditions.util.AssetUtil;
@@ -67,6 +68,8 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO
             TileEntity tile = world.getTileEntity(x, y, z);
             if(tile instanceof TileEntitySmileyCloud){
                 player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.CLOUD.ordinal(), world, x, y, z);
+
+                player.triggerAchievement(TheAchievements.NAME_SMILEY_CLOUD.ach);
             }
         }
         return true;

src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java

@@ -105,8 +105,9 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{
         if(!world.isRemote){
             world.playSoundAtEntity(player, "random.chestopen", 0.2F, world.rand.nextFloat()*0.1F+0.9F);
             this.dropItems(world, x, y, z);
-            player.addStat(TheAchievements.OPEN_TREASURE_CHEST.ach, 1);
             world.setBlockToAir(x, y, z);
+
+            player.triggerAchievement(TheAchievements.OPEN_TREASURE_CHEST.ach);
         }
         return true;
     }

src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java

@@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
+import ellpeck.actuallyadditions.achievement.TheAchievements;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
@@ -34,6 +35,10 @@ public class ItemBooklet extends Item implements IActAddItemOrBlock{
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){
         player.openGui(ActuallyAdditions.instance, GuiHandler.GuiTypes.BOOK.ordinal(), world, (int)player.posX, (int)player.posY, (int)player.posZ);
+
+        if(!world.isRemote){
+            player.triggerAchievement(TheAchievements.OPEN_BOOKLET.ach);
+        }
         return stack;
     }
 

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -378,34 +378,17 @@ info.actuallyadditions.update.buttonOptions=Click: Changelog, Shift-Click: Downl
 info.actuallyadditions.update.failed=[{"text":"The Update Check for "},{"text":"Actually Additions ","color":"dark_green"},{"text":"failed! Check Logs for more Info!","color":"none"}]
 
 #Achievements
-achievement.actuallyadditions.pickUpSolidXP=Square and yummy!
-achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience
-achievement.actuallyadditions.craftKnifeBlade=Sharp! So Sharp!
-achievement.actuallyadditions.craftKnifeBlade.desc=Craft a Knife Blade
-achievement.actuallyadditions.craftKnife=Cutcutcutcutcutcutcutcutcutcutcut!
-achievement.actuallyadditions.craftKnife.desc=Craft a Knife
-achievement.actuallyadditions.craftMashedFood=Munch munch munch!
-achievement.actuallyadditions.craftMashedFood.desc=Craft some Mashed Food
-achievement.actuallyadditions.craftWoodenCasing=Hard and sturdy!
-achievement.actuallyadditions.craftWoodenCasing.desc=Craft a Wooden Casing
-achievement.actuallyadditions.craftStoneCasing=Harder and sturdier!
-achievement.actuallyadditions.craftStoneCasing.desc=Craft a Stone Casing
-achievement.actuallyadditions.craftBasicCoil=Transmits.. power.. or something?
-achievement.actuallyadditions.craftBasicCoil.desc=Craft a Basic Coil
-achievement.actuallyadditions.craftAdvancedCoil=Transmits... more power I guess.
-achievement.actuallyadditions.craftAdvancedCoil.desc=Craft an Advanced Coil
-achievement.actuallyadditions.craftESD=From there to there..
-achievement.actuallyadditions.craftESD.desc=Craft an ESD
-achievement.actuallyadditions.craftAdvancedESD=White and Black!
-achievement.actuallyadditions.craftAdvancedESD.desc=Craft an Advanced ESD
-achievement.actuallyadditions.craftPhantomface=Wooo... teleporting!
+achievement.actuallyadditions.openBooklet=Screams of Knowledge
+achievement.actuallyadditions.openBooklet.desc=Open an Actually Additions Manual
+
+achievement.actuallyadditions.nameSmileyCloud=Your best friend
+achievement.actuallyadditions.nameSmileyCloud.desc=Name a Smiley Cloud
+
+achievement.actuallyadditions.craftPhantomface=Zoom, Zoom, Items!
 achievement.actuallyadditions.craftPhantomface.desc=Craft a Phantomface
-achievement.actuallyadditions.craftPhantomLiquiface=Bubbles.. are awesome..
-achievement.actuallyadditions.craftPhantomLiquiface.desc=Craft a Phantom Liquiface
-achievement.actuallyadditions.craftPhantomEnergyface=Watch out! It's powered!
-achievement.actuallyadditions.craftPhantomEnergyface.desc=Craft a Phantom Energyface
-achievement.actuallyadditions.openTreasureChest=You almost drowned!!
-achievement.actuallyadditions.openTreasureChest.desc=Open a Treasure Chest underwater
+
+achievement.actuallyadditions.openTreasureChest=Underwater Dungeon
+achievement.actuallyadditions.openTreasureChest.desc=Open a Treasure Chest
 
 #Booklet Recipe Names
 booklet.actuallyadditions.shapelessRecipe=Shapeless Recipe