fix a bug

5 files changed, 204 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
index 68f78503e8..4c8707e5e8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
@@ -38,8 +38,7 @@ public class GT_Material_Loader {
 		instance = this;				 
 
 		//Try Reflectively add ourselves to the GT loader.
-		try {
-			Class mInterface = Class.forName("gregtech.api.interfaces.IMaterialHandler");
+			Class mInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
 			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && mInterface != null){
 
 				//Make this class Dynamically implement IMaterialHandler
@@ -49,7 +48,7 @@ public class GT_Material_Loader {
 							new MaterialHandler(getInstance()));		
 				}
 
-				if (ReflectionUtils.invoke(Materials.class, "add", new Class[]{Class.forName("gregtech.api.interfaces.IMaterialHandler")}, new Object[]{mProxyObject})){
+				if (ReflectionUtils.invoke(Materials.class, "add", new Class[]{ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler")}, new Object[]{mProxyObject})){
 					Logger.REFLECTION("Successfully invoked add, on the proxied object implementing IMaterialHandler.");
 
 
@@ -65,9 +64,7 @@ public class GT_Material_Loader {
 				else {
 					Logger.REFLECTION("Failed to invoke add, on the proxied object implementing IMaterialHandler.");
 				}
-			}
-		}
-		catch (ClassNotFoundException e) {}		
+			}	
 		//Materials.add(this);
 		
 		//Stupid shit running twice, I don't think so.
@@ -139,12 +136,12 @@ public class GT_Material_Loader {
 			return false;
 		}		
 		try {
-			Method enableComponent = Class.forName("gregtech.api.enums.OrePrefixes").getDeclaredMethod("enableComponent", Materials.class);
+			Method enableComponent = ReflectionUtils.getClass("gregtech.api.enums.OrePrefixes").getDeclaredMethod("enableComponent", Materials.class);
 			enableComponent.invoke(prefix, mMaterial);
 			Logger.DEBUG_MATERIALS("Enabled "+prefix.name()+" for "+mMaterial.mDefaultLocalName+".");
 			return true;
 		}
-		catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | ClassNotFoundException error) {
+		catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException error) {
 			Logger.DEBUG_MATERIALS("Failed to enabled "+prefix.name()+" for "+mMaterial.mDefaultLocalName+". Caught "+error.getCause().toString()+".");
 			error.printStackTrace();			
 		}		
@@ -228,7 +225,7 @@ public class GT_Material_Loader {
 
 		//Loading the class at runtime
 		public static void main(String[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
-		    Class<?> someInterface = Class.forName("gregtech.api.interfaces.IMaterialHandler");
+		    Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
 		    Object instance = Proxy.newProxyInstance(someInterface.getClassLoader(), new Class<?>[]{someInterface}, new InvocationHandler() {
 
 		        @Override
@@ -274,7 +271,7 @@ public class GT_Material_Loader {
 
 	    public static void init(){ 
 
-	    	Class<?> someInterface = Class.forName("gregtech.api.interfaces.IMaterialHandler");		   
+	    	Class<?> someInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");		   
 	        GT_Material_Loader original = GT_Material_Loader.instance;
 	        MaterialHandler handler = new MaterialHandler(original);
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 1932f30969..ecdc3af1db 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -221,14 +221,14 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					}
 
 					//Add Shapeless recipe for low tier alloys.
-					if (tVoltageMultiplier <= 30){
+					/*if (tVoltageMultiplier <= 30){
 						if (RecipeUtils.addShapedGregtechRecipe(inputStacks, outputStacks)){
 							Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Success");
 						}
 						else {
 							Logger.WARNING("Dust Shapeless Recipe: "+material.getLocalizedName()+" - Failed");
 						}
-					}
+					}*/
 				}
 			}
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index ddba6b5bf0..15627a827f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -164,6 +164,15 @@ public class RecipeGen_Ore extends RecipeGen_Base {
 		ItemStack matDustB = getDust(bonusB);
 
 		/**
+		 * Package
+		 */
+		//Allow ore dusts to be packaged
+		if (ItemUtils.checkForInvalidItems(material.getSmallDust(1)) && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) {
+			RecipeGen_DustGeneration.generatePackagerRecipes(material);
+		}
+		
+		
+		/**
 		 * Macerate
 		 */
 		//Macerate ore to Crushed
@@ -255,8 +264,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
 				matDust, tinyDustA,null, 
 				null, null,null, 
 				new int[]{10000, 10000}, //Chances
-				5*20, //Eu
-				tVoltageMultiplier/2)){ //Time
+				5*20, //Time
+				tVoltageMultiplier/2)){ //Eu
 			Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust");
 		}
 
@@ -268,8 +277,8 @@ public class RecipeGen_Ore extends RecipeGen_Base {
 				matDust, tinyDustB,null, 
 				null, null,null, 
 				new int[]{10000, 10000}, //Chances
-				5*20, //Eu
-				tVoltageMultiplier/2)){ //Time
+				5*20, //Time
+				tVoltageMultiplier/2)){ //Eu
 			Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust");
 		}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 79615d8457..3249e0101d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -3,18 +3,15 @@ package gtPlusPlus.xmod.gregtech.loaders;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.util.GT_ModHandler;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import net.minecraft.item.ItemStack;
 
 public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
 
@@ -35,7 +32,7 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
 
 	private void generateRecipes(final Material material){
 		Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
-
+				
 		if (!CORE.GTNH) {
 			//Nuggets
 			if (ItemUtils.checkForInvalidItems(material.getNugget(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1)))
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java
new file mode 100644
index 0000000000..351a4cc546
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java
@@ -0,0 +1,180 @@
+package gtPlusPlus.xmod.gregtech.loaders.misc;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.GT_Mod;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.common.StaticFields59;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatBase;
+import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
+
+public class AssLineAchievements {
+
+	public static int assReg = -1;
+	public static ConcurrentHashMap<String, Achievement> mAchievementMap;
+	public static ConcurrentHashMap<String, Boolean> mIssuedAchievementMap;
+	public static int adjX = 5;
+	public static int adjY = 9;
+	private static boolean active = true;
+
+	public AssLineAchievements() {
+		Logger.INFO(active ? "Loading custom achievement page for Assembly Line recipes."
+				: "Achievements are disabled.");	
+		Utils.registerEvent(this);
+	}
+	
+	private static boolean ready = false;
+	private static int recipeTotal = 0;
+	private static int recipeCount = 0;
+	private static void init() {		
+		if (!ready) {
+			active = GT_Mod.gregtechproxy.mAchievements;
+			try {
+				recipeTotal = ((GT_Recipe.GT_Recipe_Map) StaticFields59.mAssLineVisualMapNEI.get(null)).mRecipeList.size();
+			} catch (IllegalArgumentException | IllegalAccessException e) {
+				recipeTotal = 0;
+			}
+			mAchievementMap = new ConcurrentHashMap<String, Achievement>();
+			mIssuedAchievementMap = new ConcurrentHashMap<String, Boolean>();	
+			ready = true;
+		}		
+		
+	}
+	
+	public static void registerAchievements() {		
+		if (active && mAchievementMap.size() > 0) {
+			AchievementPage.registerAchievementPage(new AchievementPage("GT Assembly Line",
+					(Achievement[]) mAchievementMap.values().toArray(new Achievement[mAchievementMap.size()])));			
+		}
+		else if (active) {
+			Logger.INFO("Unable to register custom achievement page for Assembly Line recipes.");
+		}
+	}
+
+	public static Achievement registerAssAchievement(GT_Recipe recipe) {
+		init();
+		String aSafeUnlocalName;
+		// Debugging
+		if (recipe == null) {
+			Logger.INFO(
+					"Someone tried to register an achievement for an invalid recipe. Please report this to Alkalus.");
+			return null;
+		}
+		if (recipe.getOutput(0) == null) {
+			Logger.INFO(
+					"Someone tried to register an achievement for a recipe with null output. Please report this to Alkalus.");
+			return null;
+		}
+		ItemStack aStack = recipe.getOutput(0);
+		try {
+			aSafeUnlocalName = aStack.getUnlocalizedName();
+		} catch (Throwable t) {
+			aSafeUnlocalName = ItemUtils.getUnlocalizedItemName(aStack);
+		}
+		
+		Achievement aYouDidSomethingInGT;
+		if (mAchievementMap.get(aSafeUnlocalName) == null) {
+			assReg++;
+			recipeCount++;
+			aYouDidSomethingInGT = registerAchievement(aSafeUnlocalName, -(11 + assReg % 5), ((assReg) / 5) - 8,
+					recipe.getOutput(0), AchievementList.openInventory, false);
+		}
+		else {
+			aYouDidSomethingInGT = null;
+		}
+		if (recipeCount >= recipeTotal) {
+			Logger.INFO("Critical mass achieved. ["+recipeCount+"]");
+			registerAchievements();
+		}
+		
+		return aYouDidSomethingInGT;
+	}
+
+	public static Achievement registerAchievement(String textId, int x, int y, ItemStack icon,
+			Achievement requirement, boolean special) {
+		if (!GT_Mod.gregtechproxy.mAchievements) {
+			return null;
+		}
+		Achievement achievement = new Achievement(textId, textId, adjX + x, adjY + y, icon, requirement);
+		if (special) {
+			achievement.setSpecial();
+		}
+		achievement.registerStat();
+		if (CORE.DEVENV) {
+			GT_Log.out.println("achievement." + textId + "=");
+			GT_Log.out.println("achievement." + textId + ".desc=");
+		}
+		mAchievementMap.put(textId, achievement);
+		return achievement;
+	}
+
+	public static void issueAchievement(EntityPlayer entityplayer, String textId) {
+		if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) {
+			return;
+		}
+		
+		entityplayer.triggerAchievement((StatBase) getAchievement(textId));
+	}
+
+	public static Achievement getAchievement(String textId) {
+		if (mAchievementMap.containsKey(textId)) {
+			Logger.INFO("Found Achivement: "+textId);
+			return (Achievement) mAchievementMap.get(textId);
+		}
+		return null;
+	}
+
+	@SubscribeEvent
+	public void onItemPickup(EntityItemPickupEvent event) {
+		EntityPlayer player = event.entityPlayer;
+		ItemStack stack = event.item.getEntityItem();
+		String aPickupUnlocalSafe = ItemUtils.getUnlocalizedItemName(stack);
+		if (player == null || stack == null) {
+			return;
+		}
+		
+		if (StaticFields59.sAssemblylineVisualRecipes == null) {
+			return;
+		}
+		
+		Logger.INFO("Trying to check for achievements");
+		// Debug scanner unlocks all AL recipes in creative
+		if (player.capabilities.isCreativeMode && aPickupUnlocalSafe.equals("gt.metaitem.01.32761")) {
+			for (GT_Recipe recipe : StaticFields59.sAssemblylineVisualRecipes.mRecipeList) {
+				issueAchievement(player, recipe.getOutput(0).getUnlocalizedName());
+				recipe.mHidden = false;
+			}
+		}
+		for (GT_Recipe recipe : StaticFields59.sAssemblylineVisualRecipes.mRecipeList) {
+			
+			String aSafeUnlocalName;
+			if (recipe.getOutput(0) == null) {
+				Logger.INFO(
+						"Someone tried to register an achievement for a recipe with null output. Please report this to Alkalus.");
+				continue;
+			}
+			ItemStack aStack = recipe.getOutput(0);
+			aSafeUnlocalName = ItemUtils.getUnlocalizedItemName(aStack);			
+			if (aSafeUnlocalName.equals(aPickupUnlocalSafe)) {
+				issueAchievement(player, aSafeUnlocalName);
+				recipe.mHidden = false;
+				Logger.INFO("FOUND: " + aSafeUnlocalName + " | " + aPickupUnlocalSafe);
+			}
+			else {
+				//Logger.INFO(aSafeUnlocalName + " | " + aPickupUnlocalSafe);
+			}
+		}
+	}
+
+}