More removal of commented out code, small formatting adjustments

1 files changed, 1 insertions, 64 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index 5965bf6035..a88f91ddc4 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -30,9 +30,6 @@ import thaumcraft.api.ThaumcraftApiHelper;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class GT_Achievements {
-
-    //public static List<Materials> oreList = new ArrayList<Materials>();
-    //public static List<Integer[]> oreStats = new ArrayList<Integer[]>();
     public static int oreReg = -1;
     public static int assReg=-1;
     public ConcurrentHashMap<String, Achievement> achievementList;
@@ -43,39 +40,7 @@ public class GT_Achievements {
     public GT_Achievements() {
         this.achievementList = new ConcurrentHashMap<>();
         this.issuedAchievements = new ConcurrentHashMap<>();
-        /*int oreList_sS=oreList.size();
-        for (int i = 0; i < oreList_sS; i++) {
-            if (oreList.get(i) != null) {
-                if (GT_Values.D1 && this.achievementList.get(oreList.get(i).mName) == null) {
-                    GT_Log.out.println("achievement." + oreList.get(i).mName + "=Find " + oreList.get(i).mName + " Ore");
-
-                    StringBuilder dimensions = new StringBuilder();
-                    boolean isFirst = true;
-                    if (oreStats.get(i)[3] == 1) {
-                        dimensions.append("Overworld");
-                        isFirst = false;
-                    }
-                    if (oreStats.get(i)[4] == 1) {
-                        if (!isFirst) dimensions.append("/");
-                        dimensions.append("Nether");
-                        isFirst = false;
-                    }
-                    if (oreStats.get(i)[5] == 1) {
-                        if (!isFirst) dimensions.append("/");
-                        dimensions.append("End");
-                        isFirst = false;
-                    }
-                    GT_Log.out.println("achievement." + oreList.get(i).mName + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString());
-                }
-                //if(oreList.get(i)==null)
-                //    GT_Log.out.println("GT Achievement - Ore with NULL pointer material tries to register achievement.");
-                //if(oreList.get(i).name()==null)
-                //    GT_Log.out.println("GT Achievement - Ore with NULL named material tries to register achievement.");
-                //else
-                registerOreAchievement(oreList.get(i));
-            }
-        }
-*/
+
         for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList)
             registerAssAchievement(recipe);
 
@@ -214,13 +179,6 @@ public class GT_Achievements {
             registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1), "denseaspossible", false);
         }
 
-//        if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){
-//            for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
-//                if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) {
-//                    codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1));
-//                }
-//            }
-//        }
         if (GT_Mod.gregtechproxy.mAchievements) {
             AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray(
                     new Achievement[this.achievementList.size()])));
@@ -230,11 +188,6 @@ public class GT_Achievements {
     }
 
     public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) {
-        /*if (aMaterial != Materials._NULL) {
-            oreList.add(aMaterial);
-            //if(!oreList.add(aMaterial)) Minecraft.getMinecraft().crashed(new CrashReport("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists.",new IllegalArgumentException()));
-        }
-        oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0});*/
     }
 
     public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) {
@@ -273,12 +226,6 @@ public class GT_Achievements {
     }
 
     public Achievement registerOreAchievement(Materials aMaterial) {
-    	/*
-        if (this.achievementList.get(aMaterial.mName) == null) {
-            oreReg++;
-            return registerAchievement(aMaterial.mName, -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1,
-                    aMaterial.mMetaItemSubID), AchievementList.openInventory, false);
-        }*/
         return null;
     }
 
@@ -295,14 +242,7 @@ public class GT_Achievements {
         if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) {
             return;
         }
-//		if (this.achievementList.containsKey(textId)) {
-//			if(this.issuedAchievements.containsKey((entityplayer.getDisplayName()+textId))){
-//			return;
-//			}else{
-//			this.issuedAchievements.put((entityplayer.getDisplayName()+textId), true);
         entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId));
-//			}
-//		}
     }
 
     public Achievement getAchievement(String textId) {
@@ -374,13 +314,10 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        //if(stack.getItem()==Items.paper){player.inventory.addItemStackToInventory(new ItemStack(Blocks.stone_slab,2));}//TODO REALLY BLOODASP, REALLY
         ItemData data = GT_OreDictUnificator.getItemData(stack);
         if (data != null) {
             if (data.mPrefix == OrePrefixes.dust && data.mMaterial.mMaterial == Materials.Bronze) {
                 issueAchievement(player, "bronze");
-//            } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == Materials.Advanced) {
-//                issueAchievement(player, "stepforward");
             }
         }
         if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) {