diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
90 files changed, 1587 insertions, 2008 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java new file mode 100644 index 0000000000..89c7c18eee --- /dev/null +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -0,0 +1,43 @@ +package gregtech.loaders.materialprocessing; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; + +public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler { + public ProcessingConfig() { + Materials.add(this); + } + + @Override + public void onMaterialsInit() { + int i = 0; + for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i < j; i++) { + String aID = (i < 10 ? "0" : "") + i; + new Materials(-1, TextureSet.SET_METALLIC, 1.0F, 0, 0, 0, 255, 255, 255, 0, "CustomMat" + aID, "CustomMat" + aID, 0, 0, 0, 0, false, false, 1, 1, 1, Dyes._NULL, "custom", true, aID); + } + } + + @Override + public void onComponentRegistration(Materials aMaterial) { + /** This is just left here as an example of how to add components. **/ + + /*Enabling/Disabling components depending on the current Materials values: + if ((aMaterial.mTypes & 0x40) != 0) { //This material can be made into tool heads + OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); + } */ + + /* Enabling specific components: + OrePrefixes.spring.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotDouble.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotTriple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotQuadruple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.ingotQuintuple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateDouble.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateTriple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateQuadruple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateQuintuple.mDisabledItems.remove(Materials.Cobalt); + OrePrefixes.plateDense.mDisabledItems.remove(Materials.Cobalt); */ + } +} 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 { |