diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_Achievements.java | 17 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java | 21 |
2 files changed, 21 insertions, 17 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index e39b9ea320..6a9481492c 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -33,8 +33,8 @@ 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 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; @@ -45,7 +45,7 @@ public class GT_Achievements { public GT_Achievements() { this.achievementList = new ConcurrentHashMap<>(); this.issuedAchievements = new ConcurrentHashMap<>(); - int oreList_sS=oreList.size(); + /*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) { @@ -77,7 +77,7 @@ public class GT_Achievements { registerOreAchievement(oreList.get(i)); } } - +*/ for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) registerAssAchievement(recipe); @@ -231,13 +231,13 @@ public class GT_Achievements { } } - public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) { + /*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) { if (!GT_Mod.gregtechproxy.mAchievements) { @@ -274,7 +274,8 @@ public class GT_Achievements { return achievement; } - public Achievement registerOreAchievement(Materials aMaterial) { + /*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, @@ -282,7 +283,7 @@ public class GT_Achievements { } return null; } - +*/ public Achievement registerAssAchievement(GT_Recipe recipe) { if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) { assReg++; diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java index 16d9487272..6170e93652 100644 --- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java +++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java @@ -1,8 +1,7 @@ package gregtech.loaders.postload;
-//import bloodasp.galacticgreg.GT_Worldgenerator_Space;
+import bloodasp.galacticgreg.WorldGenGaGT;
import cpw.mods.fml.common.Loader;
-import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ConfigCategories;
import gregtech.api.enums.Materials;
@@ -104,10 +103,10 @@ public class GT_Worldgenloader for (int j = GregTech_API.sWorldgenFile.get("worldgen", "AmountOfCustomSmallOreSlots", 16); i < j; i++) {
new GT_Worldgen_GT_Ore_SmallPieces("ore.small.custom." + (i < 10 ? "0" : "") + i, false, 0, 0, 0, false, false, false, false, false, false, Materials._NULL);
}
- if (GregTech_API.mImmersiveEngineering && GT_Mod.gregtechproxy.mImmersiveEngineeringRecipes) {
+ /*if (GregTech_API.mImmersiveEngineering && GT_Mod.gregtechproxy.mImmersiveEngineeringRecipes) {
blusunrize.immersiveengineering.api.tool.ExcavatorHandler.mineralList.clear();
blusunrize.immersiveengineering.api.tool.ExcavatorHandler.mineralCache.clear();
- }
+ }*/
new GT_Worldgen_GT_Ore_Layer("ore.mix.naquadah", true, 10, 90, 30, 5, 32, false, false, false, Materials.Naquadah, Materials.Naquadah, Materials.Naquadah, Materials.NaquadahEnriched);
new GT_Worldgen_GT_Ore_Layer("ore.mix.lignite", true, 80, 210, 160, 8, 32, true, false, false, Materials.Lignite, Materials.Lignite, Materials.Lignite, Materials.Coal);
@@ -144,8 +143,8 @@ public class GT_Worldgenloader /*
* custom GTNH OreMixes
- * WARNING: NO DUPLICATS OR DEPRECATED MATERIALS IN HERE.
- *
+ * WARNING: NO DUPLICATS IN aName OR DEPRECATED MATERIALS IN HERE.
+ * Materials can be used unlimited, since achievements for Ores are turned off.
*/
//aName, aDefault, aMinY, aMaxY, aWeight, aDensity, aSize, aOverworld, aNether, aEnd, aPrimary, aSecondary, aBetween, aSporadic
@@ -246,7 +245,7 @@ public class GT_Worldgenloader new GT_Worldgen_GT_Ore_Layer("ore.mix.realgarneodymiumgiant", true, 205, 215, 100, 10, 32, false, false, false, Materials.Realgar, Materials.Neodymium, Materials.Realgar, Materials.Neodymium);
new GT_Worldgen_GT_Ore_Layer("ore.mix.heavypentele", true, 40, 60, 60, 5, 32, false, false, false, Materials.Arsenic, Materials.Bismuth, Materials.Antimony, Materials.Antimony);
new GT_Worldgen_GT_Ore_Layer("ore.mix.europa", true, 55, 65, 110, 4, 24, false, false, false, Materials.Magnesite, Materials.BandedIron, Materials.Sulfur, Materials.Opal);
- new GT_Worldgen_GT_Ore_Layer("ore.mix.europacore", true, 5, 9, 5, 2, 16, false, false, false, Materials.Chrome, Materials.Tungsten, Materials.Molybdenum, Materials.Manganese);
+ new GT_Worldgen_GT_Ore_Layer("ore.mix.europacore", true, 5, 15, 5, 2, 16, false, false, false, Materials.Chrome, Materials.Tungsten, Materials.Molybdenum, Materials.Manganese);
new GT_Worldgen_GT_Ore_Layer("ore.mix.secondlanthanid", true, 10, 40, 10, 3, 24, false, false, false, Materials.Samarium, Materials.Europium, Materials.Promethium, Materials.Gadolinium);
i = 0;
@@ -254,8 +253,12 @@ public class GT_Worldgenloader new GT_Worldgen_GT_Ore_Layer("ore.mix.custom." + (i < 10 ? "0" : "") + i, false, 0, 0, 0, 0, 0, false, false, false, Materials._NULL, Materials._NULL, Materials._NULL, Materials._NULL);
}
- if (GregTech_API.mImmersiveEngineering && GT_Mod.gregtechproxy.mImmersiveEngineeringRecipes) {
+ //DO NOT DELETE V THIS V
+ new WorldGenGaGT().run(); //this function calles Galactic Greg and enables its generation.
+ //DO NOT DELETE ^ THIS ^
+
+ /*if (GregTech_API.mImmersiveEngineering && GT_Mod.gregtechproxy.mImmersiveEngineeringRecipes) {
blusunrize.immersiveengineering.api.tool.ExcavatorHandler.recalculateChances(true);
- }
+ }*/
}
}
|