Changed achievement IDs to use a tconstruct: prefix

SlimeKnights · Mar 15, 2014 · 92576f9 · 92576f9
1 parent 666bfa8
commit 92576f9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java
@@ -934,17 +934,15 @@ public void addAchievements ()
     {
         HashMap<String, Achievement> achievements = TAchievements.achievements;
 
-        achievements.put("tconstruct.beginner", new Achievement("" + 2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null));// .setIndependent());
-        achievements.put("tconstruct.pattern", new Achievement("" + 2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")));
-        achievements.put("tconstruct.tinkerer", new Achievement("" + 2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")));
-        achievements.put("tconstruct.preparedFight", new Achievement("" + 2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")));
-        achievements.put("tconstruct.proTinkerer",
-                new Achievement("" + 2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial());
-        achievements.put("tconstruct.smelteryMaker", new Achievement("" + 2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")));
-        achievements.put("tconstruct.enemySlayer", new Achievement("" + 2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")));
-        achievements.put("tconstruct.dualConvenience",
-                new Achievement("" + 2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")).setSpecial());
-        achievements.put("tconstruct.doingItWrong", new Achievement("" + 2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")));
-        achievements.put("tconstruct.betterCrafting", new Achievement("" + 2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")));
+        achievements.put("tconstruct:beginner", new Achievement("tconstruct:beginner", "tconstruct.beginner", 0, 0, TRepo.manualBook, null));// .setIndependent());
+        achievements.put("tconstruct:pattern", new Achievement("tconstruct:pattern", "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct:beginner")));
+        achievements.put("tconstruct:tinkerer", new Achievement("tconstruct:tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct:pattern")));
+        achievements.put("tconstruct:preparedFight", new Achievement("tconstruct:preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct:tinkerer")));
+        achievements.put("tconstruct:proTinkerer", new Achievement("tconstruct:proTinkerer", "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct:tinkerer")).setSpecial());
+        achievements.put("tconstruct:smelteryMaker", new Achievement("tconstruct:smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct:beginner")));
+        achievements.put("tconstruct:enemySlayer", new Achievement("tconstruct:enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct:preparedFight")));
+        achievements.put("tconstruct:dualConvenience", new Achievement("tconstruct:dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct:enemySlayer")).setSpecial());
+        achievements.put("tconstruct:doingItWrong", new Achievement("tconstruct:doingItWrong", "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct:smelteryMaker")));
+        achievements.put("tconstruct:betterCrafting", new Achievement("tconstruct:betterCrafting", "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct:beginner")));
     }
 }
diff --git a/src/main/java/tconstruct/inventory/SlotFrypan.java b/src/main/java/tconstruct/inventory/SlotFrypan.java
@@ -30,7 +30,7 @@ public void putStack (ItemStack par1ItemStack)
             {
                 return;
             }
-            player.addStat(TAchievements.achievements.get("tconstruct.dualConvenience"), 1);
+            player.addStat(TAchievements.achievements.get("tconstruct:dualConvenience"), 1);
         }
     }
 

diff --git a/src/main/java/tconstruct/items/Manual.java b/src/main/java/tconstruct/items/Manual.java
@@ -34,7 +34,7 @@ public Manual()
     @SideOnly(Side.CLIENT)
     public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player)
     {
-        player.addStat(TAchievements.achievements.get("tconstruct.beginner"), 1);
+        player.addStat(TAchievements.achievements.get("tconstruct:beginner"), 1);
         Side side = FMLCommonHandler.instance().getEffectiveSide();
         player.openGui(TConstruct.instance, mantle.client.MProxyClient.manualGuiID, world, 0, 0, 0);
         FMLClientHandler.instance().displayGuiScreen(player, new GuiManual(stack, getData(stack)));

diff --git a/src/main/java/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java
@@ -44,12 +44,12 @@ public void onCrafting (ItemCraftedEvent event)// EntityPlayer player,
                     tags.setBoolean("smelteryManual", true);
                     AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TRepo.manualBook, 1, 2));
                 }
-                event.player.addStat(TAchievements.achievements.get("tconstruct.smelteryMaker"), 1);
+                event.player.addStat(TAchievements.achievements.get("tconstruct:smelteryMaker"), 1);
             }
 
             if (ComparisonHelper.areEquivalent(item, TRepo.craftingStationWood))
             {
-                event.player.addStat(TAchievements.achievements.get("tconstruct.betterCrafting"), 1);
+                event.player.addStat(TAchievements.achievements.get("tconstruct:betterCrafting"), 1);
             }
         }
     }

diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java
@@ -472,7 +472,7 @@ public void onLivingDeath (LivingDeathEvent event)
             ItemStack stack = murderer.getHeldItem();
             if (stack != null && stack.getItem() instanceof Weapon)
             {
-                murderer.addStat(TAchievements.achievements.get("tconstruct.enemySlayer"), 1);
+                murderer.addStat(TAchievements.achievements.get("tconstruct:enemySlayer"), 1);
             }
         }
     }

diff --git a/src/main/java/tconstruct/util/TEventHandlerAchievement.java b/src/main/java/tconstruct/util/TEventHandlerAchievement.java
@@ -1,5 +1,9 @@
 package tconstruct.util;
 
+import tconstruct.common.TRepo;
+
+import mantle.event.ManualOpenEvent;
+
 import net.minecraftforge.common.util.FakePlayer;
 import tconstruct.achievements.TAchievements;
 import tconstruct.blocks.logic.ToolForgeLogic;
@@ -17,16 +21,16 @@ public void onToolCrafted (ToolCraftedEvent event)
     {
         if (event.player != null && !(event.player instanceof FakePlayer))
         {
-            event.player.addStat(TAchievements.achievements.get("tconstruct.tinkerer"), 1);
+            event.player.addStat(TAchievements.achievements.get("tconstruct:tinkerer"), 1);
 
             if (event.tool != null && event.tool.getItem() instanceof Weapon)
             {
-                event.player.addStat(TAchievements.achievements.get("tconstruct.preparedFight"), 1);
+                event.player.addStat(TAchievements.achievements.get("tconstruct:preparedFight"), 1);
             }
 
             if (event.inventory != null && event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0)
             {
-                event.player.addStat(TAchievements.achievements.get("tconstruct.proTinkerer"), 1);
+                event.player.addStat(TAchievements.achievements.get("tconstruct:proTinkerer"), 1);
             }
         }
     }
@@ -38,9 +42,8 @@ public void onItemPlacedIntoCasting (SmelteryEvent.ItemInsertedIntoCasting event
         {
             if (event.item.getItem() instanceof ToolCore)
             {
-                event.player.addStat(TAchievements.achievements.get("tconstruct.doingItWrong"), 1);
+                event.player.addStat(TAchievements.achievements.get("tconstruct:doingItWrong"), 1);
             }
         }
     }
-
 }