+ Added new achievements page for Assembly Line Recipes.

+ Added custom safety checks to Assembly Line Recipe/Achievement handling via ASM.
+ Added a safe way to get the unlocal names of items.
- Removed 'Press e' Achievement when in Dev. (Thank, Fucking, God)
$ Fixed a mild error concerning localization of Americium-241 Blocks.

3 files changed, 46 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 9176dcc720..140019f73b 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -23,6 +23,7 @@ import gtPlusPlus.core.handler.BurnableFuelHandler;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
 import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.handler.StopAnnoyingFuckingAchievements;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
 import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
@@ -130,6 +131,10 @@ public class CommonProxy {
 		Utils.registerEvent(new HandlerTooltip_EIO());
 		// Handles Custom Tooltips for GC
 		Utils.registerEvent(new HandlerTooltip_GC());
+		
+		if (CORE.DEVENV) {
+			Utils.registerEvent(new StopAnnoyingFuckingAchievements());
+		}
 
 		// Register Chunkloader
 		ForgeChunkManager.setForcedChunkLoadingCallback(GTplusplus.instance, ChunkManager.getInstance());
diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
new file mode 100644
index 0000000000..b10e67aeaf
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.core.handler;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.stats.AchievementList;
+import net.minecraftforge.event.entity.player.AchievementEvent;
+
+public class StopAnnoyingFuckingAchievements {
+
+	/**
+	 * Stops me getting fireworks every fucking time I open my inventory upon first loading a dev client.
+	 * @param event
+	 */
+	@SubscribeEvent
+	public void FUCK_OFF(AchievementEvent event)	{
+		if (event.achievement.equals(AchievementList.openInventory)) {
+			if (MathUtils.randInt(0, 10) >= 9)
+				PlayerUtils.messagePlayer(event.entityPlayer, "Bang! Nah, Just joking, there's no fireworks. :)");
+			event.setCanceled(true);
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 6fa58804dd..2522ba56da 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1042,4 +1042,21 @@ public class ItemUtils {
 		return aDisplay;
 	}
 
+	public static String getUnlocalizedItemName(ItemStack aStack) {
+		if (aStack == null) {
+			return "ERROR.Empty.Stack";
+		}
+		String aDisplay = null;
+		try {
+			aDisplay = (aStack.getUnlocalizedName()).trim();
+			
+		} catch (Throwable t) {
+			aDisplay = aStack.getItem().getUnlocalizedName();
+		}
+		if (aDisplay == null || aDisplay.length() <= 0) {
+			aDisplay = aStack.getItem().getUnlocalizedNameInefficiently(aStack);
+		}
+		return aDisplay;
+	}
+
 }