aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java72
-rw-r--r--src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java24
2 files changed, 42 insertions, 54 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index ed02167284..f13a460dc5 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -30,24 +30,23 @@ import net.minecraftforge.fluids.FluidStack;
import thaumcraft.api.ThaumcraftApiHelper;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-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 ConcurrentHashMap<String, Achievement> achievementList;
- public ConcurrentHashMap<String, Boolean> issuedAchievements;
+ public HashMap<String, Achievement> achievementList;
+ public HashMap<String, Boolean> issuedAchievements;
public int adjX = 5;
public int adjY = 9;
public GT_Achievements() {
- this.achievementList = new ConcurrentHashMap();
- this.issuedAchievements = new ConcurrentHashMap();
- int oreList_sS=oreList.size();
- for (int i = 0; i < oreList_sS; i++) {
+ this.achievementList = new HashMap();
+ this.issuedAchievements = new HashMap();
+ for (int i = 0; i < oreList.size(); i++) {
if (GT_Values.D1 && this.achievementList.get(oreList.get(i).name()) == null) {
GT_Log.out.println("achievement." + oreList.get(i).name() + "=Find " + oreList.get(i).name() + " Ore");
@@ -191,10 +190,8 @@ public class GT_Achievements {
if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){
for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
- if (GregTech_API.sGeneratedMaterials[i] != null) {
- if(!oreList.contains(GregTech_API.sGeneratedMaterials[i])){
- codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1));
- }
+ 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));
}
}
}
@@ -285,29 +282,27 @@ public class GT_Achievements {
}
ItemData data = GT_OreDictUnificator.getItemData(stack);
- if (data != null) {
- if (data.mPrefix == OrePrefixes.ingot) {
- if (data.mMaterial.mMaterial == Materials.Aluminium) {
- issueAchievement(player, "gtaluminium");
- } else if (data.mMaterial.mMaterial == Materials.Titanium) {
- issueAchievement(player, "titan");
- } else if (data.mMaterial.mMaterial == Materials.BlueSteel) {
- issueAchievement(player, "complexalloys");
- } else if (data.mMaterial.mMaterial == Materials.Tungsten) {
- issueAchievement(player, "tungsten");
- } else if (data.mMaterial.mMaterial == Materials.Osmium) {
- issueAchievement(player, "osmium");
- } else if (data.mMaterial.mMaterial == Materials.TungstenSteel) {
- issueAchievement(player, "tungstensteel");
- } else if (data.mMaterial.mMaterial == Materials.HSSG) {
- issueAchievement(player, "hssg");
- } else if (data.mMaterial.mMaterial == Materials.Naquadah) {
- issueAchievement(player, "stargatematerial");
- } else if (data.mMaterial.mMaterial == Materials.NaquadahAlloy) {
- issueAchievement(player, "alienmetallurgy");
- } else if (data.mMaterial.mMaterial == Materials.Naquadria) {
- issueAchievement(player, "finalpreparations");
- }
+ if ((data != null) && (data.mPrefix == OrePrefixes.ingot)) {
+ if (data.mMaterial.mMaterial == Materials.Aluminium) {
+ issueAchievement(player, "gtaluminium");
+ } else if (data.mMaterial.mMaterial == Materials.Titanium) {
+ issueAchievement(player, "titan");
+ } else if (data.mMaterial.mMaterial == Materials.BlueSteel) {
+ issueAchievement(player, "complexalloys");
+ } else if (data.mMaterial.mMaterial == Materials.Tungsten) {
+ issueAchievement(player, "tungsten");
+ } else if (data.mMaterial.mMaterial == Materials.Osmium) {
+ issueAchievement(player, "osmium");
+ } else if (data.mMaterial.mMaterial == Materials.TungstenSteel) {
+ issueAchievement(player, "tungstensteel");
+ } else if (data.mMaterial.mMaterial == Materials.HSSG) {
+ issueAchievement(player, "hssg");
+ } else if (data.mMaterial.mMaterial == Materials.Naquadah) {
+ issueAchievement(player, "stargatematerial");
+ } else if (data.mMaterial.mMaterial == Materials.NaquadahAlloy) {
+ issueAchievement(player, "alienmetallurgy");
+ } else if (data.mMaterial.mMaterial == Materials.Naquadria) {
+ issueAchievement(player, "finalpreparations");
}
}
if (stack.getUnlocalizedName().equals("ic2.itemPartIndustrialDiamond")) {
@@ -498,8 +493,7 @@ public class GT_Achievements {
}
} else if (data.mPrefix == OrePrefixes.ore || data.mPrefix == OrePrefixes.oreBlackgranite || data.mPrefix == OrePrefixes.oreEndstone
|| data.mPrefix == OrePrefixes.oreNetherrack || data.mPrefix == OrePrefixes.oreRedgranite) {
- int data_getAllMaterialStacks_sS=data.getAllMaterialStacks().size();
- for (int i = 0; i < data_getAllMaterialStacks_sS; i++) {
+ for (int i = 0; i < data.getAllMaterialStacks().size(); i++) {
issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.name());
if (data.getAllMaterialStacks().get(i).mMaterial == Materials.AnyIron) {
issueAchievement(player, "iron");
@@ -518,10 +512,8 @@ public class GT_Achievements {
} 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");
- }
+ } else if ((data.mPrefix == OrePrefixes.nugget) && Loader.isModLoaded("Thaumcraft") && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) {
+ issueAchievement(player, "steel");
}
} else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == Materials.Advanced) {
issueAchievement(player, "stepforward");
diff --git a/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java b/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java
index cafde84836..1c1d4f44a6 100644
--- a/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java
+++ b/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java
@@ -1,13 +1,14 @@
package gregtech.loaders.misc;
-import java.io.File;
-import java.util.HashMap;
-
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
public class OreProcessingConfiguration
implements Runnable
{
@@ -40,17 +41,12 @@ public class OreProcessingConfiguration
}
}
@Override
- public void run()
- {
- for (String tMaterialName : this.mEnabledMaterials.keySet())
- {
- if (this.mEnabledMaterials.get(tMaterialName))
- {
- Materials.valueOf(tMaterialName).mTypes |= 8;
- }
- else if ((Materials.valueOf(tMaterialName).mTypes & 8) != 0)
- {
- Materials.valueOf(tMaterialName).mTypes ^= 8;
+ public void run() {
+ for (Map.Entry<String, Boolean> aEntry : this.mEnabledMaterials.entrySet()) {
+ if (this.mEnabledMaterials.get(aEntry.getKey())) {
+ Materials.valueOf(aEntry.getKey()).mTypes |= 8;
+ } else if ((Materials.valueOf(aEntry.getKey()).mTypes & 8) != 0) {
+ Materials.valueOf(aEntry.getKey()).mTypes ^= 8;
}
}
}
generated by cgit (git 2.46.0) at 2025-05-30 05:46:59 +0000