aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/loaders/misc
diff options
context:
space:
mode:
authorBlood-Asp <Blood@Asp>2015-08-02 13:00:23 +0200
committerBlood-Asp <Blood@Asp>2015-08-02 13:00:23 +0200
commitc71e7473d6fa42abee3db76371c16e433b133f7a (patch)
tree6a386f62dc1450ae8d47b37461da74ac17fe6f4f /main/java/gregtech/loaders/misc
parent080a4c21172a4015418b92bac9f70332a4a1cf75 (diff)
downloadGT5-Unofficial-c71e7473d6fa42abee3db76371c16e433b133f7a.tar.gz
GT5-Unofficial-c71e7473d6fa42abee3db76371c16e433b133f7a.tar.bz2
GT5-Unofficial-c71e7473d6fa42abee3db76371c16e433b133f7a.zip
Update 5.08.26
Diffstat (limited to 'main/java/gregtech/loaders/misc')
-rw-r--r--main/java/gregtech/loaders/misc/GT_Achievements.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/main/java/gregtech/loaders/misc/GT_Achievements.java b/main/java/gregtech/loaders/misc/GT_Achievements.java
index 43ac6c9736..dd2074d7d7 100644
--- a/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -4,7 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.ThaumcraftApiHelper;
import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent;
@@ -414,6 +417,7 @@ public int adjY = 9;
if (player == null||stack==null) {
return;
}
+// System.out.println("Pickup: "+stack.getUnlocalizedName());
ItemData data = GT_OreDictUnificator.getItemData(stack);
if (data != null) {
if (data.mPrefix == OrePrefixes.dust) {
@@ -433,6 +437,14 @@ public int adjY = 9;
issueAchievement(player, "washing");
}else if(data.mPrefix == OrePrefixes.crushedCentrifuged){
issueAchievement(player, "spinit");
+ }else if(data.mMaterial.mMaterial == Materials.Steel){
+ if(data.mPrefix == OrePrefixes.ingot && stack.stackSize == stack.getMaxStackSize()){
+ issueAchievement(player, "steel");
+ }else if(data.mPrefix == OrePrefixes.nugget && Loader.isModLoaded("Thaumcraft")){
+ if(ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")){
+ issueAchievement(player, "steel");
+ }
+ }
}
}
if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){