diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_Achievements.java | 49 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java | 54 |
2 files changed, 25 insertions, 78 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index a329ec5e50..491c4428aa 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -48,28 +48,30 @@ public class GT_Achievements { this.issuedAchievements = new ConcurrentHashMap(); int oreList_sS=oreList.size(); for (int i = 0; i < oreList_sS; 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"); - - 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; + 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()); } - GT_Log.out.println("achievement." + oreList.get(i).name() + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString()); + registerOreAchievement(oreList.get(i)); } - registerOreAchievement(oreList.get(i)); } registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false); registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false); @@ -215,7 +217,6 @@ public class GT_Achievements { if (!GT_Mod.gregtechproxy.mAchievements) { return null; } - ; Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, requirement); if (special) { achievement.setSpecial(); @@ -248,9 +249,9 @@ public class GT_Achievements { } public Achievement registerOreAchievement(Materials aMaterial) { - if (this.achievementList.get(aMaterial.name()) == null) { + if (this.achievementList.get(aMaterial.mName) == null) { oreReg++; - return registerAchievement(aMaterial.name(), -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1, + return registerAchievement(aMaterial.mName, -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1, aMaterial.mMetaItemSubID), AchievementList.openInventory, false); } return null; @@ -496,7 +497,7 @@ public class GT_Achievements { || data.mPrefix == OrePrefixes.oreNetherrack || data.mPrefix == OrePrefixes.oreRedgranite) { int data_getAllMaterialStacks_sS=data.getAllMaterialStacks().size(); for (int i = 0; i < data_getAllMaterialStacks_sS; i++) { - issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.name()); + issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.mName); if (data.getAllMaterialStacks().get(i).mMaterial == Materials.AnyIron) { issueAchievement(player, "iron"); } diff --git a/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java b/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java deleted file mode 100644 index 1c1d4f44a6..0000000000 --- a/src/main/java/gregtech/loaders/misc/OreProcessingConfiguration.java +++ /dev/null @@ -1,54 +0,0 @@ -package gregtech.loaders.misc; - -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 -{ - private final Configuration mConfiguration; - private final HashMap<String, Boolean> mEnabledMaterials; - public OreProcessingConfiguration(File aModConfigurationDirectory) - { - this.mEnabledMaterials = new HashMap<String, Boolean>(); - this.mConfiguration = - new Configuration(new File(new File(aModConfigurationDirectory, "GregTech"), "OreProcessing.cfg")); - this.mConfiguration.load(); - this.loadConfiguration(); - if (this.mConfiguration.hasChanged()) - { - this.mConfiguration.save(); - } - } - private void loadConfiguration() - { - for (Materials tMaterial : GregTech_API.sGeneratedMaterials) - { - if (tMaterial != null && tMaterial != Materials._NULL) - { - String tMaterialName = tMaterial.name(); - boolean tDefaultValue = (tMaterial.mTypes & 8) != 0; - Property tProperty = - this.mConfiguration.get("processores", tMaterialName + "_" + tDefaultValue, tDefaultValue); - this.mEnabledMaterials.put(tMaterialName, tProperty.getBoolean(tDefaultValue)); - } - } - } - @Override - 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; - } - } - } -} - |