diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-08-27 20:50:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 18:50:30 +0000 |
| commit | 4908d5967c3dfeff5616c65144e701859b9e30a2 (patch) | |
| tree | 3e58a4b8ebd8b70745e81c4c71c765980e4ec4f4 /src/main/java/gregtech/loaders | |
| parent | 3c574facfb224029c0b69865e281023da6170ce0 (diff) | |
| download | GT5-Unofficial-4908d5967c3dfeff5616c65144e701859b9e30a2.tar.gz GT5-Unofficial-4908d5967c3dfeff5616c65144e701859b9e30a2.tar.bz2 GT5-Unofficial-4908d5967c3dfeff5616c65144e701859b9e30a2.zip | |
Config/gregtech.cfg (#2939)
* first pass on config migration
* second pass on config migration
* removing bad configs
* rename config classes and register them
* move debug options to its own debug category
* migrate pollution
* finish migrating general config
* removing useless config
* finish GregTech.cfg port to GTNHLib
* don't accidentally force panic mode in dev env
* typo
* defaults are now handled by the confg handler
* remove dead config
* force config save after defaults are being written
* stop messing with the GregTech.cfg externally
* removing comments
* new underground fluid builder and porting default underground fluids to code
* move config handlers of gregtech.cfg in their own package
* process MachineStats.cfg
* yeeted MaterialProperties.cfg
* remove unused compat in GTNH
* process OverpoweredStuff.cfg
* process Other.cfg
* ungregify some config variables
* remove unused variables
* fix Ids.cfg not being populated
* delete duplicate printing of MTE IDs in GT5U clients
* bump hodgepodge version to get mod phase timers
* process Client.cfg
* fix bad category naming
* registering all the config handlers in gui
* bump GTNHLib version
* actually only registering client configs
* use proper double arrays now
* move GT ore mixes to patternbuilders
* dead code
* fix multifiles config not being handled properly
* import class from NHCore
* removing reflection
* use enums for registration
* yeet config for Asteroid dimensions
* remove unused since 2015 enum entry
* todo
* rework oremix enums
* imported dimension data in enums
* convert old dirty predicate into proper one
* hook gagreg onto the OreMixes enum
* finally nuke worldgen.ore.mix config category!
* hook gagreg small ores onto the SmallOres enum
* imported dim values in enum
* fix dirty work around in vm predicate
* yeet unused classes
* hook GT stones to GTStones enum
* yeet all the remaining booleans in the worldgen category
* port endasteroids category
* port general category
* deprecated
* yeet unused bw compat
* finish worldgen config migration
* hardcode config into code
* remove not generated config entry
* remove Unification.cfg
* fix build
* migrate oreveins away from config
* migrate small ores away from config
* delete config parser
* forgotten
* fix EoH recipe crash in dev
* fix GT NEI Ore Plugin config and csv paths
* shade opencsv
* rewrite csv generator
* spotless apply
Diffstat (limited to 'src/main/java/gregtech/loaders')
9 files changed, 275 insertions, 2978 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 95ee79db74..1c90187ee2 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -17,7 +17,6 @@ import net.minecraft.item.ItemStack; import codechicken.nei.api.API; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -3960,21 +3959,13 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_ZPM.get(1L), bitsd, - new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', - GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) - ? ItemList.Energy_Module - : ItemList.ZPM2, - 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.ZPM), 'P', - ItemList.Field_Generator_ZPM }); + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', ItemList.Energy_Module, 'C', + ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.ZPM), 'P', ItemList.Field_Generator_ZPM }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_UV.get(1L), bitsd, - new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', - GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) - ? ItemList.Energy_Module - : ItemList.ZPM3, - 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.UV), 'P', - ItemList.Field_Generator_UV }); + new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', ItemList.Energy_Module, 'C', + ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.UV), 'P', ItemList.Field_Generator_UV }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_Assemblyline.get(1L), diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 7747711cd8..1245a1dbaf 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -20,8 +20,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -372,13 +370,10 @@ public class GT_Achievements { "over9000", false); registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1), "finalpreparations", false); - if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) { - registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1), "denseaspossible", false); - registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1), "zpmage", false); - registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1), "uvage", false); - } else { - registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1), "denseaspossible", false); - } + + registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1), "denseaspossible", false); + registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1), "zpmage", false); + registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1), "uvage", false); if (GT_Mod.gregtechproxy.mAchievements) { AchievementPage.registerAchievementPage( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 945ffae386..79342a460d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -63,17 +63,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .eut(TierEU.RECIPE_LV) .addTo(centrifugeRecipes); } else { - registerStandardOreRecipes( - aPrefix, - aMaterial, - GT_Utility.copyAmount(1, aStack), - Math.max( - 1, - gregtech.api.GregTech_API.sOPStuff.get( - gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, - aMaterial.toString(), - 1)) - * (tIsRich ? 2 : 1)); + registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), tIsRich ? 2 : 1); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java index 5ece6f5315..2da9f4b865 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java @@ -40,16 +40,7 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis .eut(TierEU.RECIPE_LV) .addTo(centrifugeRecipes); } else { - registerStandardOreRecipes( - aPrefix, - aMaterial, - GT_Utility.copyAmount(1, aStack), - Math.max( - 1, - gregtech.api.GregTech_API.sOPStuff.get( - gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, - aMaterial.toString(), - 1))); + registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), 1); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 7998ba1ed2..5f0310a21e 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -15,7 +15,6 @@ import static gregtech.api.util.GT_RecipeBuilder.TICKS; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -415,11 +414,9 @@ public class GT_PostLoad { @SuppressWarnings("UnstableApiUsage") // Stable enough for this project Stopwatch stopwatch = Stopwatch.createStarted(); GT_Mod.GT_FML_LOGGER.info("Replacing Vanilla Materials in recipes, please wait."); - Set<Materials> replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList - ? Arrays.stream(Materials.values()) - .filter(GT_RecipeRegistrator::hasVanillaRecipes) - .collect(Collectors.toSet()) - : new HashSet<>(Arrays.asList(Materials.values())); + Set<Materials> replaceVanillaItemsSet = Arrays.stream(Materials.values()) + .filter(GT_RecipeRegistrator::hasVanillaRecipes) + .collect(Collectors.toSet()); ProgressManager.ProgressBar progressBar = ProgressManager .push("Register materials", replaceVanillaItemsSet.size()); diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java index 8213013bfc..921f227b08 100644 --- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java +++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java @@ -1,2384 +1,33 @@ package gregtech.loaders.postload; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; +import bloodasp.galacticgreg.WorldGenGaGT; +import gregtech.api.enums.GTStones; +import gregtech.api.enums.OreMixes; +import gregtech.api.enums.SmallOres; import gregtech.api.util.GT_Log; -import gregtech.common.GT_Worldgen_GT_Ore_Layer; -import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces; -import gregtech.common.GT_Worldgen_Stone; import gregtech.common.GT_Worldgenerator; public class GT_Worldgenloader implements Runnable { public void run() { - new GT_Worldgenerator(); - new GT_Worldgen_Stone( - "overworld.stone.blackgranite.tiny", - true, - GregTech_API.sBlockGranites, - 0, - 0, - 1, - 75, - 5, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.blackgranite.small", - true, - GregTech_API.sBlockGranites, - 0, - 0, - 1, - 100, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.blackgranite.medium", - true, - GregTech_API.sBlockGranites, - 0, - 0, - 1, - 200, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.blackgranite.large", - true, - GregTech_API.sBlockGranites, - 0, - 0, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.blackgranite.huge", - true, - GregTech_API.sBlockGranites, - 0, - 0, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "overworld.stone.redgranite.tiny", - true, - GregTech_API.sBlockGranites, - 8, - 0, - 1, - 75, - 5, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.redgranite.small", - true, - GregTech_API.sBlockGranites, - 8, - 0, - 1, - 100, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.redgranite.medium", - true, - GregTech_API.sBlockGranites, - 8, - 0, - 1, - 200, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.redgranite.large", - true, - GregTech_API.sBlockGranites, - 8, - 0, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.redgranite.huge", - true, - GregTech_API.sBlockGranites, - 8, - 0, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "overworld.stone.marble.tiny", - true, - GregTech_API.sBlockStones, - 0, - 0, - 1, - 75, - 5, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.marble.small", - true, - GregTech_API.sBlockStones, - 0, - 0, - 1, - 100, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.marble.medium", - true, - GregTech_API.sBlockStones, - 0, - 0, - 1, - 200, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.marble.large", - true, - GregTech_API.sBlockStones, - 0, - 0, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.marble.huge", - true, - GregTech_API.sBlockStones, - 0, - 0, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "overworld.stone.basalt.tiny", - true, - GregTech_API.sBlockStones, - 8, - 0, - 1, - 75, - 5, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.basalt.small", - true, - GregTech_API.sBlockStones, - 8, - 0, - 1, - 100, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.basalt.medium", - true, - GregTech_API.sBlockStones, - 8, - 0, - 1, - 200, - 10, - 0, - 180, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.basalt.large", - true, - GregTech_API.sBlockStones, - 8, - 0, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "overworld.stone.basalt.huge", - true, - GregTech_API.sBlockStones, - 8, - 0, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "nether.stone.blackgranite.tiny", - false, - GregTech_API.sBlockGranites, - 0, - -1, - 1, - 50, - 45, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.blackgranite.small", - false, - GregTech_API.sBlockGranites, - 0, - -1, - 1, - 100, - 60, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.blackgranite.medium", - false, - GregTech_API.sBlockGranites, - 0, - -1, - 1, - 200, - 80, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.blackgranite.large", - false, - GregTech_API.sBlockGranites, - 0, - -1, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.blackgranite.huge", - false, - GregTech_API.sBlockGranites, - 0, - -1, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "nether.stone.redgranite.tiny", - false, - GregTech_API.sBlockGranites, - 8, - -1, - 1, - 50, - 45, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.redgranite.small", - false, - GregTech_API.sBlockGranites, - 8, - -1, - 1, - 100, - 60, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.redgranite.medium", - false, - GregTech_API.sBlockGranites, - 8, - -1, - 1, - 200, - 80, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.redgranite.large", - false, - GregTech_API.sBlockGranites, - 8, - -1, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.redgranite.huge", - false, - GregTech_API.sBlockGranites, - 8, - -1, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "nether.stone.marble.tiny", - false, - GregTech_API.sBlockStones, - 0, - -1, - 1, - 50, - 45, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.marble.small", - false, - GregTech_API.sBlockStones, - 0, - -1, - 1, - 100, - 60, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.marble.medium", - false, - GregTech_API.sBlockStones, - 0, - -1, - 1, - 200, - 80, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.marble.large", - false, - GregTech_API.sBlockStones, - 0, - -1, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.marble.huge", - false, - GregTech_API.sBlockStones, - 0, - -1, - 1, - 400, - 150, - 0, - 120, - null, - false); - - new GT_Worldgen_Stone( - "nether.stone.basalt.tiny", - false, - GregTech_API.sBlockStones, - 8, - -1, - 1, - 50, - 45, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.basalt.small", - false, - GregTech_API.sBlockStones, - 8, - -1, - 1, - 100, - 60, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.basalt.medium", - false, - GregTech_API.sBlockStones, - 8, - -1, - 1, - 200, - 80, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.basalt.large", - false, - GregTech_API.sBlockStones, - 8, - -1, - 1, - 300, - 70, - 0, - 120, - null, - false); - new GT_Worldgen_Stone( - "nether.stone.basalt.huge", - false, - GregTech_API.sBlockStones, - 8, - -1, - 1, - 400, - 150, - 0, - 120, - null, - false); + // GT Stones + for (GTStones stone : GTStones.values()) { + stone.addGTStone(); + } // GT Default Small Ores - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.copper", - true, - 60, - 180, - 32, - true, - true, - true, - true, - true, - false, - Materials.Copper); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tin", - true, - 80, - 220, - 32, - true, - true, - true, - true, - true, - true, - Materials.Tin); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.bismuth", - true, - 80, - 120, - 8, - false, - true, - false, - true, - true, - false, - Materials.Bismuth); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.coal", - true, - 120, - 250, - 24, - true, - false, - false, - false, - false, - false, - Materials.Coal); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.iron", - true, - 40, - 100, - 16, - true, - true, - true, - true, - true, - false, - Materials.Iron); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.lead", - true, - 40, - 180, - 16, - false, - true, - true, - true, - true, - true, - Materials.Lead); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.zinc", - true, - 80, - 210, - 24, - true, - true, - true, - true, - true, - false, - Materials.Zinc); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.gold", - true, - 20, - 60, - 8, - true, - false, - true, - true, - true, - true, - Materials.Gold); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.silver", - true, - 20, - 60, - 20, - true, - true, - true, - true, - true, - true, - Materials.Silver); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.nickel", - true, - 80, - 150, - 8, - true, - false, - true, - true, - true, - true, - Materials.Nickel); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.lapis", - true, - 10, - 50, - 4, - true, - false, - false, - true, - false, - true, - Materials.Lapis); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.diamond", - true, - 5, - 15, - 2, - true, - false, - false, - true, - true, - true, - Materials.Diamond); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.emerald", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Emerald); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.ruby", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Ruby); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.sapphire", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Sapphire); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.greensapphire", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.GreenSapphire); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.olivine", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Olivine); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.topaz", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Topaz); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tanzanite", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Tanzanite); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.amethyst", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Amethyst); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.opal", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Opal); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.jasper", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Jasper); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.bluetopaz", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.BlueTopaz); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.amber", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.Amber); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.foolsruby", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.FoolsRuby); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.garnetred", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.GarnetRed); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.garnetyellow", - true, - 5, - 35, - 2, - false, - false, - false, - false, - true, - true, - Materials.GarnetYellow); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.redstone", - true, - 5, - 25, - 8, - true, - true, - false, - true, - true, - true, - Materials.Redstone); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.netherquartz", - true, - 30, - 120, - 64, - false, - true, - false, - false, - false, - false, - Materials.NetherQuartz); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.saltpeter", - true, - 10, - 60, - 8, - false, - true, - false, - false, - false, - false, - Materials.Saltpeter); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.sulfur", - true, - 5, - 60, - 40, - false, - true, - false, - false, - false, - false, - Materials.Sulfur); - - // TODO: GTNH Custom Small Ores - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.titanium", - true, - 10, - 180, - 32, - false, - false, - false, - Materials.Titanium); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tungsten", - true, - 10, - 120, - 16, - false, - false, - false, - Materials.Tungsten); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.meteoriciron", - true, - 50, - 70, - 8, - false, - false, - false, - Materials.MeteoricIron); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.firestone", - true, - 5, - 15, - 2, - false, - false, - false, - Materials.Firestone); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.neutronium", - true, - 5, - 15, - 8, - false, - false, - false, - Materials.Neutronium); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.chromite", - true, - 20, - 40, - 8, - false, - false, - false, - Materials.Chromite); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.tungstate", - true, - 20, - 40, - 8, - false, - false, - false, - Materials.Tungstate); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.naquadah", - true, - 5, - 25, - 8, - false, - false, - false, - Materials.Naquadah); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.quantium", - true, - 5, - 25, - 6, - false, - false, - false, - Materials.Quantium); - new GT_Worldgen_GT_Ore_SmallPieces("ore.small.mythril", true, 5, 25, 6, false, false, false, Materials.Mytryl); - new GT_Worldgen_GT_Ore_SmallPieces("ore.small.ledox", true, 40, 60, 4, false, false, false, Materials.Ledox); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.oriharukon", - true, - 20, - 40, - 6, - false, - false, - false, - Materials.Oriharukon); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.draconium", - true, - 5, - 15, - 4, - false, - false, - false, - Materials.Draconium); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.awdraconium", - true, - 5, - 15, - 2, - false, - false, - false, - Materials.DraconiumAwakened); - new GT_Worldgen_GT_Ore_SmallPieces("ore.small.desh", true, 10, 30, 6, false, false, false, Materials.Desh); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.blackplutonium", - true, - 25, - 45, - 6, - false, - false, - false, - Materials.BlackPlutonium); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.infinitycatalyst", - true, - 40, - 80, - 6, - false, - false, - false, - Materials.InfinityCatalyst); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.infinity", - true, - 2, - 40, - 2, - false, - false, - false, - Materials.Infinity); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.bedrockium", - true, - 5, - 25, - 6, - false, - false, - false, - Materials.Bedrockium); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.realgar", - true, - 15, - 85, - 32, - false, - true, - false, - Materials.Realgar); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.certusquartz", - true, - 5, - 115, - 16, - false, - true, - false, - Materials.CertusQuartz); - new GT_Worldgen_GT_Ore_SmallPieces("ore.small.jade", true, 5, 35, 2, false, false, false, Materials.Jade); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.deepiron", - true, - 5, - 40, - 8, - false, - false, - false, - Materials.DeepIron); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.redgarnet", - true, - 5, - 35, - 2, - false, - false, - false, - Materials.GarnetRed); - new GT_Worldgen_GT_Ore_SmallPieces( - "ore.small.chargedcertus", - true, - 5, - 115, - 4, - false, - false, - false, - Materials.CertusQuartzCharged); - - // GT Default Veins - - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.naquadah", - true, - 10, - 90, - 30, - 4, - 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, - 7, - 32, - true, - false, - false, - Materials.Lignite, - Materials.Lignite, - Materials.Lignite, - Materials.Coal); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.coal", - true, - 30, - 80, - 80, - 5, - 32, - true, - false, - false, - Materials.Coal, - Materials.Coal, - Materials.Coal, - Materials.Lignite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.magnetite", - true, - 60, - 180, - 160, - 2, - 32, - true, - false, - false, - Materials.Magnetite, - Materials.Magnetite, - Materials.Iron, - Materials.VanadiumMagnetite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.gold", - true, - 30, - 60, - 160, - 2, - 32, - true, - false, - true, - Materials.Magnetite, - Materials.Magnetite, - Materials.VanadiumMagnetite, - Materials.Gold); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.iron", - true, - 10, - 40, - 120, - 3, - 24, - true, - true, - false, - Materials.BrownLimonite, - Materials.YellowLimonite, - Materials.BandedIron, - Materials.Malachite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.cassiterite", - true, - 60, - 220, - 50, - 4, - 24, - true, - false, - true, - Materials.Tin, - Materials.Tin, - Materials.Cassiterite, - Materials.Tin); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.tetrahedrite", - true, - 80, - 120, - 70, - 3, - 24, - false, - true, - true, - Materials.Tetrahedrite, - Materials.Tetrahedrite, - Materials.Copper, - Materials.Stibnite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.netherquartz", - true, - 40, - 80, - 80, - 4, - 24, - false, - true, - false, - Materials.NetherQuartz, - Materials.NetherQuartz, - Materials.NetherQuartz, - Materials.Quartzite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.sulfur", - true, - 5, - 20, - 100, - 4, - 24, - false, - true, - false, - Materials.Sulfur, - Materials.Sulfur, - Materials.Pyrite, - Materials.Sphalerite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.copper", - true, - 5, - 60, - 80, - 3, - 24, - true, - true, - true, - Materials.Chalcopyrite, - Materials.Iron, - Materials.Pyrite, - Materials.Copper); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.bauxite", - true, - 10, - 80, - 80, - 3, - 24, - false, - false, - false, - Materials.Bauxite, - Materials.Ilmenite, - Materials.Aluminium, - Materials.Ilmenite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.salts", - true, - 50, - 70, - 50, - 2, - 24, - true, - false, - false, - Materials.RockSalt, - Materials.Salt, - Materials.Lepidolite, - Materials.Spodumene); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.redstone", - true, - 5, - 40, - 60, - 2, - 24, - true, - true, - false, - Materials.Redstone, - Materials.Redstone, - Materials.Ruby, - Materials.Cinnabar); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.soapstone", - true, - 20, - 50, - 40, - 2, - 16, - true, - false, - false, - Materials.Soapstone, - Materials.Talc, - Materials.Glauconite, - Materials.Pentlandite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.nickel", - true, - 10, - 40, - 40, - 2, - 16, - false, - false, - true, - Materials.Garnierite, - Materials.Nickel, - Materials.Cobaltite, - Materials.Pentlandite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.platinum", - true, - 40, - 50, - 5, - 2, - 16, - false, - false, - false, - Materials.Cooperite, - Materials.Palladium, - Materials.Platinum, - Materials.Iridium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.pitchblende", - true, - 30, - 60, - 40, - 2, - 16, - false, - false, - false, - Materials.Pitchblende, - Materials.Pitchblende, - Materials.Uraninite, - Materials.Uraninite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.monazite", - true, - 20, - 40, - 30, - 2, - 16, - false, - false, - false, - Materials.Bastnasite, - Materials.Bastnasite, - Materials.Monazite, - Materials.Neodymium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.molybdenum", - true, - 20, - 50, - 5, - 2, - 16, - false, - true, - true, - Materials.Wulfenite, - Materials.Molybdenite, - Materials.Molybdenum, - Materials.Powellite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.tungstate", - true, - 20, - 60, - 10, - 2, - 16, - false, - false, - false, - Materials.Scheelite, - Materials.Scheelite, - Materials.Tungstate, - Materials.Lithium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.sapphire", - true, - 10, - 40, - 60, - 2, - 16, - false, - false, - false, - Materials.Almandine, - Materials.Pyrope, - Materials.Sapphire, - Materials.GreenSapphire); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.manganese", - true, - 20, - 30, - 20, - 2, - 16, - true, - true, - false, - Materials.Grossular, - Materials.Spessartine, - Materials.Pyrolusite, - Materials.Tantalite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.quartz", - true, - 80, - 120, - 30, - 2, - 16, - false, - true, - false, - Materials.Quartzite, - Materials.Barite, - Materials.CertusQuartz, - Materials.CertusQuartz); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.diamond", - true, - 5, - 20, - 40, - 1, - 16, - true, - false, - false, - Materials.Graphite, - Materials.Graphite, - Materials.Diamond, - Materials.Coal); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.olivine", - true, - 10, - 40, - 60, - 2, - 16, - false, - false, - false, - Materials.Bentonite, - Materials.Magnesite, - Materials.Olivine, - Materials.Glauconite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.apatite", - true, - 40, - 60, - 60, - 2, - 16, - true, - false, - false, - Materials.Apatite, - Materials.Apatite, - Materials.TricalciumPhosphate, - Materials.Pyrochlore); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.galena", - true, - 5, - 45, - 40, - 4, - 16, - false, - false, - false, - Materials.Galena, - Materials.Galena, - Materials.Silver, - Materials.Lead); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.lapis", - true, - 20, - 50, - 40, - 4, - 16, - true, - false, - false, - Materials.Lazurite, - Materials.Sodalite, - Materials.Lapis, - Materials.Calcite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.beryllium", - true, - 5, - 30, - 30, - 2, - 16, - false, - true, - true, - Materials.Beryllium, - Materials.Beryllium, - Materials.Emerald, - Materials.Thorium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.uranium", - true, - 20, - 30, - 20, - 2, - 16, - false, - false, - false, - Materials.Uraninite, - Materials.Uraninite, - Materials.Uranium, - Materials.Uranium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.oilsand", - true, - 50, - 80, - 40, - 5, - 16, - true, - false, - false, - Materials.Oilsands, - Materials.Oilsands, - Materials.Oilsands, - Materials.Oilsands); - - /* - * TODO: custom GTNH OreMixes WARNING: NO DUPLICATES 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 - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.neutronium", - true, - 5, - 30, - 10, - 2, - 16, - false, - false, - false, - Materials.Neutronium, - Materials.Adamantium, - Materials.Naquadah, - Materials.Titanium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.aquaignis", - true, - 5, - 35, - 16, - 2, - 16, - false, - false, - false, - Materials.InfusedWater, - Materials.InfusedFire, - Materials.Amber, - Materials.Cinnabar); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.terraaer", - true, - 5, - 35, - 16, - 2, - 16, - false, - false, - false, - Materials.InfusedEarth, - Materials.InfusedAir, - Materials.Amber, - Materials.Cinnabar); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.perditioordo", - true, - 5, - 35, - 16, - 2, - 16, - false, - false, - false, - Materials.InfusedEntropy, - Materials.InfusedOrder, - Materials.Amber, - Materials.Cinnabar); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.coppertin", - true, - 80, - 200, - 80, - 3, - 24, - true, - false, - false, - Materials.Chalcopyrite, - Materials.Vermiculite, - Materials.Cassiterite, - Materials.Alunite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.titaniumchrome", - true, - 10, - 70, - 16, - 2, - 16, - false, - false, - false, - Materials.Ilmenite, - Materials.Chromite, - Materials.Uvarovite, - Materials.Perlite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.mineralsand", - true, - 50, - 60, - 80, - 3, - 24, - true, - false, - false, - Materials.BasalticMineralSand, - Materials.GraniticMineralSand, - Materials.FullersEarth, - Materials.Gypsum); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.garnettin", - true, - 50, - 60, - 80, - 3, - 24, - true, - false, - false, - Materials.CassiteriteSand, - Materials.GarnetSand, - Materials.Asbestos, - Materials.Diatomite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.kaolinitezeolite", - true, - 50, - 70, - 60, - 4, - 16, - true, - false, - false, - Materials.Kaolinite, - Materials.Zeolite, - Materials.FullersEarth, - Materials.GlauconiteSand); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.mica", - true, - 20, - 40, - 20, - 2, - 16, - true, - false, - false, - Materials.Kyanite, - Materials.Mica, - Materials.Cassiterite, - Materials.Pollucite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.dolomite", - true, - 150, - 200, - 40, - 4, - 24, - true, - false, - false, - Materials.Dolomite, - Materials.Wollastonite, - Materials.Trona, - Materials.Andradite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.platinumchrome", - true, - 5, - 30, - 10, - 2, - 16, - false, - false, - false, - Materials.Platinum, - Materials.Chrome, - Materials.Cooperite, - Materials.Palladium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.iridiummytryl", - true, - 15, - 40, - 10, - 2, - 16, - false, - false, - false, - Materials.Nickel, - Materials.Iridium, - Materials.Palladium, - Materials.Mithril); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.osmium", - true, - 5, - 30, - 10, - 2, - 16, - false, - false, - false, - Materials.Nickel, - Materials.Osmium, - Materials.Iridium, - Materials.Nickel); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.saltpeterelectrotine", - true, - 5, - 45, - 40, - 3, - 16, - false, - true, - false, - Materials.Saltpeter, - Materials.Diatomite, - Materials.Electrotine, - Materials.Alunite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.desh", - true, - 5, - 40, - 30, - 2, - 16, - false, - false, - false, - Materials.Desh, - Materials.Desh, - Materials.Scheelite, - Materials.Tungstate); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.draconium", - true, - 20, - 40, - 40, - 1, - 16, - false, - false, - false, - Materials.Draconium, - Materials.Electrotine, - Materials.Jade, - Materials.Vinteum); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.quantium", - true, - 5, - 25, - 30, - 3, - 24, - false, - false, - false, - Materials.Quantium, - Materials.Amethyst, - Materials.Rutile, - Materials.Ardite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.callistoice", - true, - 40, - 60, - 40, - 2, - 16, - false, - false, - false, - Materials.CallistoIce, - Materials.Topaz, - Materials.BlueTopaz, - Materials.Alduorite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.mytryl", - true, - 10, - 30, - 40, - 2, - 16, - false, - false, - false, - Materials.Mytryl, - Materials.Jasper, - Materials.Ceruclase, - Materials.Vulcanite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.ledox", - true, - 55, - 65, - 30, - 2, - 24, - false, - false, - false, - Materials.Ledox, - Materials.Opal, - Materials.Orichalcum, - Materials.Rubracium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.oriharukon", - true, - 30, - 60, - 40, - 2, - 16, - false, - false, - false, - Materials.Oriharukon, - Materials.Tanzanite, - Materials.Vyroxeres, - Materials.Mirabilite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.blackplutonium", - true, - 5, - 25, - 40, - 2, - 24, - false, - false, - false, - Materials.BlackPlutonium, - Materials.GarnetRed, - Materials.GarnetYellow, - Materials.Borax); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.infusedgold", - true, - 15, - 40, - 30, - 2, - 16, - false, - false, - false, - Materials.Gold, - Materials.Gold, - Materials.InfusedGold, - Materials.Platinum); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.niobium", - true, - 5, - 30, - 60, - 2, - 24, - false, - false, - false, - Materials.Niobium, - Materials.Yttrium, - Materials.Gallium, - Materials.Gallium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.tungstenirons", - true, - 5, - 25, - 16, - 2, - 30, - false, - false, - false, - Materials.Tungsten, - Materials.Silicon, - Materials.DeepIron, - Materials.ShadowIron); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.uraniumgtnh", - true, - 10, - 30, - 60, - 2, - 24, - false, - false, - false, - Materials.Thorium, - Materials.Uranium, - Materials.Plutonium241, - Materials.Uranium235); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.vanadiumgold", - true, - 10, - 50, - 60, - 2, - 24, - false, - false, - false, - Materials.Vanadium, - Materials.Magnetite, - Materials.Gold, - Materials.Chrome); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.netherstar", - true, - 20, - 60, - 60, - 2, - 24, - false, - false, - false, - Materials.GarnetSand, - Materials.NetherStar, - Materials.GarnetRed, - Materials.GarnetYellow); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.garnet", - true, - 10, - 30, - 40, - 2, - 16, - false, - false, - false, - Materials.GarnetRed, - Materials.GarnetYellow, - Materials.Chrysotile, - Materials.Realgar); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.rareearth", - true, - 30, - 60, - 40, - 2, - 24, - false, - false, - false, - Materials.Cadmium, - Materials.Caesium, - Materials.Lanthanum, - Materials.Cerium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.richnuclear", - true, - 55, - 120, - 5, - 2, - 8, - false, - false, - false, - Materials.Uranium, - Materials.Plutonium, - Materials.Thorium, - Materials.Thorium); - 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, - 15, - 5, - 2, - 16, - false, - false, - false, - Materials.Chrome, - Materials.Tungstate, - 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.Neodymium, - Materials.Tartarite, - Materials.Tartarite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.quartzspace", - true, - 40, - 80, - 20, - 3, - 16, - false, - false, - false, - Materials.Quartzite, - Materials.Barite, - Materials.CertusQuartz, - Materials.CertusQuartz); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.rutile", - true, - 5, - 20, - 8, - 4, - 12, - false, - false, - false, - Materials.Rutile, - Materials.Titanium, - Materials.Bauxite, - Materials.MeteoricIron); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.tfgalena", - true, - 5, - 35, - 40, - 4, - 16, - false, - false, - false, - Materials.Galena, - Materials.Silver, - Materials.Lead, - Materials.Cryolite); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.luvtantalite", - true, - 20, - 30, - 10, - 4, - 16, - false, - false, - false, - Materials.Pyrolusite, - Materials.Apatite, - Materials.Tantalite, - Materials.Pyrochlore); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.certusquartz", - true, - 40, - 80, - 60, - 5, - 32, - false, - false, - false, - Materials.CertusQuartz, - Materials.CertusQuartz, - Materials.CertusQuartzCharged, - Materials.QuartzSand); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.infinitycatalyst", - true, - 5, - 20, - 15, - 2, - 16, - false, - false, - false, - Materials.Neutronium, - Materials.Adamantium, - Materials.InfinityCatalyst, - Materials.Bedrockium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.cosmicneutronium", - true, - 5, - 20, - 15, - 2, - 16, - false, - false, - false, - Materials.Neutronium, - Materials.CosmicNeutronium, - Materials.BlackPlutonium, - Materials.Bedrockium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.dilithium", - true, - 30, - 100, - 30, - 3, - 24, - false, - false, - false, - Materials.Dilithium, - Materials.Dilithium, - Materials.MysteriousCrystal, - Materials.Vinteum); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.naquadria", - true, - 10, - 90, - 40, - 4, - 24, - false, - false, - false, - Materials.Naquadah, - Materials.NaquadahEnriched, - Materials.Naquadria, - Materials.Trinium); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.awakeneddraconium", - true, - 20, - 40, - 20, - 3, - 16, - false, - false, - false, - Materials.Draconium, - Materials.Draconium, - Materials.DraconiumAwakened, - Materials.NetherStar); - new GT_Worldgen_GT_Ore_Layer( - "ore.mix.tengam", - true, - 30, - 180, - 80, - 2, - 32, - false, - false, - false, - Materials.TengamRaw, - Materials.TengamRaw, - Materials.Electrotine, - Materials.Samarium); + for (SmallOres smallOre : SmallOres.values()) { + smallOre.addGTSmallOre(); + } - // DO NOT DELETE V THIS V - this is needed so that gregtech generates its Ore Layer's first (the ones up there), - // which can then be transformed into "GT_Worldgen_GT_Ore_Layer_Space". Also, Reflexion is slow. - try { - Class<?> clazz = Class.forName("bloodasp.galacticgreg.WorldGenGaGT"); - Constructor<?> constructor = clazz.getConstructor(); - Method method = clazz.getMethod("run"); - method.invoke(constructor.newInstance()); - GT_Log.out.println("Started Galactic Greg ore gen code"); - // this function calls Galactic Greg and enables its generation. - } catch (Exception e) { - // ClassNotFound is expected if Galactic Greg is absent, so only report if other problem - if (!(e instanceof ClassNotFoundException)) { - GT_Log.err.println("Unable to start Galactic Greg ore gen code"); - e.printStackTrace(GT_Log.err); - } + // GT Veins registration + for (OreMixes oreMix : OreMixes.values()) { + oreMix.addGTOreLayer(); } - // DO NOT DELETE ^ THIS ^ + new WorldGenGaGT().run(); + GT_Log.out.println("Started Galactic Greg ore gen code"); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 449bda7b27..dfbb2501f0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -1201,16 +1200,6 @@ public class DistilleryRecipes implements Runnable { Materials.Carbon.getDustTiny(3), 120, 120); - - if (GregTech_API.sSpecialFile.get("general", "EnableLagencyOilGalactiCraft", false) - && FluidRegistry.getFluid("oilgc") != null) - addUniversalDistillationRecipe( - new FluidStack(FluidRegistry.getFluid("oilgc"), 50), - new FluidStack[] { Materials.SulfuricHeavyFuel.getFluid(15), Materials.SulfuricLightFuel.getFluid(50), - Materials.SulfuricNaphtha.getFluid(20), Materials.SulfuricGas.getGas(60) }, - null, - 20, - 96); } public void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index ce69a4fa27..fda6c4c9e8 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -31,7 +31,6 @@ import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -2061,59 +2060,33 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator .set(OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16)); - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateIron", true)) { - GT_OreDictUnificator - .set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0)); - } else { - GT_OreDictUnificator.set( - OrePrefixes.plate, - Materials.Iron, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0), - false, - false); - } + GT_OreDictUnificator.set( + OrePrefixes.plate, + Materials.Iron, + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0), + false, + false); - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateSteel", true)) { - GT_OreDictUnificator - .set(OrePrefixes.plate, Materials.Steel, GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1)); - } else { - GT_OreDictUnificator.set( - OrePrefixes.plate, - Materials.Steel, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1), - false, - false); - } + GT_OreDictUnificator.set( + OrePrefixes.plate, + Materials.Steel, + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1), + false, + false); - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateTinAlloy", true)) { - GT_OreDictUnificator.set( - OrePrefixes.plate, - Materials.TinAlloy, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2)); - } else { - GT_OreDictUnificator.set( - OrePrefixes.plate, - Materials.TinAlloy, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2), - false, - false); - } + GT_OreDictUnificator.set( + OrePrefixes.plate, + Materials.TinAlloy, + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2), + false, + false); - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateCopper", true)) { - GT_OreDictUnificator - .set(OrePrefixes.plate, Materials.Copper, GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3)); - } else { - GT_OreDictUnificator.set( - OrePrefixes.plate, - Materials.Copper, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3), - false, - false); - } + GT_OreDictUnificator.set( + OrePrefixes.plate, + Materials.Copper, + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3), + false, + false); GT_OreDictUnificator.set( OrePrefixes.dust, diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 26d75c7933..a2e6137cff 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -2,7 +2,6 @@ package gregtech.loaders.preload; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.Mods.CraftTweaker; -import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GregTech; @@ -14,7 +13,6 @@ import java.io.PrintStream; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.List; import java.util.Objects; import java.util.regex.Matcher; @@ -35,7 +33,6 @@ import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.discovery.ModDiscoverer; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -50,6 +47,16 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_RecipeBuilder; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; +import gregtech.common.config.client.ConfigColorModulation; +import gregtech.common.config.client.ConfigInterface; +import gregtech.common.config.client.ConfigRender; +import gregtech.common.config.client.ConfigWaila; +import gregtech.common.config.gregtech.ConfigDebug; +import gregtech.common.config.gregtech.ConfigFeatures; +import gregtech.common.config.gregtech.ConfigGeneral; +import gregtech.common.config.gregtech.ConfigMachines; +import gregtech.common.config.gregtech.ConfigOreDropBehavior; +import gregtech.common.config.gregtech.ConfigPollution; import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineBase; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom; @@ -126,33 +133,28 @@ public class GT_PreLoad { .addStringLocalization("Material." + aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName)); } - public static Configuration getConfiguration(File configDir) { - File tFile = new File(new File(configDir, "GregTech"), "GregTech.cfg"); - Configuration tMainConfig = new Configuration(tFile); - tMainConfig.load(); - tFile = new File(new File(configDir, "GregTech"), "IDs.cfg"); + public static void getConfiguration(File configDir) { + File tFile = new File(new File(configDir, "GregTech"), "IDs.cfg"); GT_Config.sConfigFileIDs = new Configuration(tFile); GT_Config.sConfigFileIDs.load(); GT_Config.sConfigFileIDs.save(); - GregTech_API.sMachineFile = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "MachineStats.cfg"))); - GregTech_API.sWorldgenFile = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "WorldGeneration.cfg"))); - GregTech_API.sMaterialProperties = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "MaterialProperties.cfg"))); - GregTech_API.sUnification = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "Unification.cfg"))); - GregTech_API.sSpecialFile = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "Other.cfg"))); - GregTech_API.sOPStuff = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "OverpoweredStuff.cfg"))); - - GregTech_API.sClientDataFile = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "Client.cfg"))); - return tMainConfig; + + tFile = new File(new File(configDir, "GregTech"), "Cleanroom.cfg"); + GT_Config.cleanroomFile = new Configuration(tFile); + GT_Config.cleanroomFile.load(); + GT_Config.cleanroomFile.save(); + + tFile = new File(new File(configDir, "GregTech"), "UndergroundFluids.cfg"); + GT_Config.undergroundFluidsFile = new Configuration(tFile); + GT_Config.undergroundFluidsFile.load(); + GT_Config.undergroundFluidsFile.save(); + + GregTech_API.NEIClientFIle = new GT_Config( + new Configuration(new File(new File(configDir, "GregTech"), "NEIClient.cfg"))); + } - public static void createLogFiles(File parentFile, Configuration tMainConfig) { + public static void createLogFiles(File parentFile) { GT_Log.mLogFile = new File(parentFile, "logs/GregTech.log"); if (!GT_Log.mLogFile.exists()) { try { @@ -163,8 +165,7 @@ public class GT_PreLoad { GT_Log.out = GT_Log.err = new PrintStream(GT_Log.mLogFile); } catch (FileNotFoundException ignored) {} - if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingOreDict", false) - .getBoolean(false)) { + if (ConfigGeneral.loggingOreDict) { GT_Log.mOreDictLogFile = new File(parentFile, "logs/OreDict.log"); if (!GT_Log.mOreDictLogFile.exists()) { try { @@ -183,8 +184,7 @@ public class GT_PreLoad { GT_Log.ore.println("******************************************************************************"); tList.forEach(GT_Log.ore::println); } - if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingExplosions", true) - .getBoolean(true)) { + if (ConfigGeneral.loggingExplosions) { GT_Log.mExplosionLog = new File(parentFile, "logs/Explosion.log"); if (!GT_Log.mExplosionLog.exists()) { try { @@ -196,8 +196,7 @@ public class GT_PreLoad { } catch (Throwable ignored) {} } - if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingPlayerActivity", true) - .getBoolean(true)) { + if (ConfigGeneral.loggingPlayerActicity) { GT_Log.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log"); if (!GT_Log.mPlayerActivityLogFile.exists()) { try { @@ -371,270 +370,126 @@ public class GT_PreLoad { GT_ModHandler.addScrapboxDrop(200.0F, GT_ModHandler.getIC2Item("scrap", 1L)); } - public static void loadConfig(Configuration tMainConfig) { - GT_Values.D1 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug", false) - .getBoolean(false); - GT_Values.D2 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug2", false) - .getBoolean(false); - GT_Values.allow_broken_recipemap = tMainConfig.get(GT_Mod.aTextGeneral, "debug allow broken recipemap", false) - .getBoolean(false); - GT_Values.debugCleanroom = tMainConfig.get(GT_Mod.aTextGeneral, "debugCleanroom", false) - .getBoolean(false); - GT_Values.debugDriller = tMainConfig.get(GT_Mod.aTextGeneral, "debugDriller", false) - .getBoolean(false); - GT_Values.debugWorldGen = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldGen", false) - .getBoolean(false); - GT_Values.debugOrevein = tMainConfig.get(GT_Mod.aTextGeneral, "debugOrevein", false) - .getBoolean(false); - GT_Values.debugSmallOres = tMainConfig.get(GT_Mod.aTextGeneral, "debugSmallOres", false) - .getBoolean(false); - GT_Values.debugStones = tMainConfig.get(GT_Mod.aTextGeneral, "debugStones", false) - .getBoolean(false); - GT_Values.debugBlockMiner = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockMiner", false) - .getBoolean(false); - GT_Values.debugBlockPump = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockPump", false) - .getBoolean(false); - GT_Values.debugEntityCramming = tMainConfig.get(GT_Mod.aTextGeneral, "debugEntityCramming", false) - .getBoolean(false); - GT_Values.debugWorldData = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldData", false) - .getBoolean(false); - GT_Values.oreveinPercentage = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPercentage_100", 100) - .getInt(100); - GT_Values.oreveinAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinAttempts_64", 64) - .getInt(64); - GT_Values.oreveinMaxPlacementAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinMaxPlacementAttempts_8", 8) - .getInt(8); - GT_Values.oreveinPlacerOres = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOres", true) - .getBoolean(true); - GT_Values.oreveinPlacerOresMultiplier = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOresMultiplier", 2) - .getInt(2); - // GT_Values.oreveinMaxSize = tMainConfig.get(aTextGeneral, "oreveinMaxSize_64",64).getInt(64); - GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30) - .getInt(30); - GT_Values.blacklistedTileEntiyClassNamesForWA = tMainConfig.getStringList( - "blacklistedTileEntiyClassNamesForWA", - "machines", - GT_Values.blacklistedTileEntiyClassNamesForWA, - "class names to be blacklisted from the world accelerator"); - GT_Values.cleanroomGlass = (float) tMainConfig.get("machines", "ReinforcedGlassPercentageForCleanroom", 5D) - .getDouble(5D); - GT_Values.enableChunkloaders = tMainConfig.get("machines", "enableChunkloaders", true) - .getBoolean(true); - GT_Values.alwaysReloadChunkloaders = tMainConfig.get("machines", "alwaysReloadChunkloaders", false) - .getBoolean(false); - GT_Values.debugChunkloaders = tMainConfig.get("machines", "debugChunkloaders", false) - .getBoolean(false); - GT_Values.disableDigitalChestsExternalAccess = tMainConfig - .get("machines", "disableDigitalChestsExternalAccess", false) - .getBoolean(false); - GT_Values.enableMultiTileEntities = tMainConfig.get( - "machines", - "enableMultiTileEntities", - false, - "This enabled MuTEs(multitile entities) to be added to the game. MuTEs are in the start of development and its not recommended to enable them unless you know what you are doing.") - .getBoolean(false) - // Make sure MuTEs are enabled in development - || (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig - .get(GT_Mod.aTextGeneral, "TicksForLagAveragingWithScanner", 25) - .getInt(25); - GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig - .get(GT_Mod.aTextGeneral, "MillisecondsPassedInGTTileEntityUntilLagWarning", 100) - .getInt(100); - if (tMainConfig.get(GT_Mod.aTextGeneral, "disable_STDOUT", false) - .getBoolean(false)) { - GT_FML_LOGGER.info("Disableing Console Messages."); - GT_FML_LOGGER.exit(); - System.out.close(); - System.err.close(); + public static void loadConfig() { + // general + GT_Values.D1 = ConfigDebug.D1; + GT_Values.D2 = ConfigDebug.D2; + GT_Values.allow_broken_recipemap = ConfigDebug.allowBrokenRecipeMap; + GT_Values.debugCleanroom = ConfigDebug.debugCleanroom; + GT_Values.debugDriller = ConfigDebug.debugDriller; + GT_Values.debugWorldGen = ConfigDebug.debugWorldgen; + GT_Values.debugOrevein = ConfigDebug.debugOrevein; + GT_Values.debugSmallOres = ConfigDebug.debugSmallOres; + GT_Values.debugStones = ConfigDebug.debugStones; + GT_Values.debugBlockMiner = ConfigDebug.debugBlockMiner; + GT_Values.debugBlockPump = ConfigDebug.debugBlockPump; + GT_Values.debugEntityCramming = ConfigDebug.debugEntityCramming; + GT_Values.debugWorldData = ConfigDebug.debugWorldData; + GT_Values.oreveinPercentage = ConfigGeneral.oreveinPercentage; + GT_Values.oreveinAttempts = ConfigGeneral.oreveinAttempts; + GT_Values.oreveinMaxPlacementAttempts = ConfigGeneral.oreveinMaxPlacementAttempts; + GT_Values.oreveinPlacerOres = ConfigGeneral.oreveinPlacerOres; + GT_Values.oreveinPlacerOresMultiplier = ConfigGeneral.oreveinPlacerOresMultiplier; + GregTech_API.TICKS_FOR_LAG_AVERAGING = ConfigGeneral.ticksForLagAveraging; + GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = ConfigGeneral.millisecondThesholdUntilLagWarning; + GregTech_API.sTimber = ConfigGeneral.timber; + GregTech_API.sDrinksAlwaysDrinkable = ConfigGeneral.drinksAlwaysDrinkable; + GregTech_API.sDoShowAllItemsInCreative = ConfigGeneral.doShowAllItemsInCreative; + GregTech_API.sMultiThreadedSounds = ConfigGeneral.multiThreadedSounds; + GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = ConfigGeneral.maxEqualEntitiesAtOneSpot; + GT_Mod.gregtechproxy.mFlintChance = ConfigGeneral.flintChance; + GT_Mod.gregtechproxy.mItemDespawnTime = ConfigGeneral.itemDespawnTime; + GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = ConfigGeneral.allowSmallBoilerAutomation; + GT_Mod.gregtechproxy.mDisableVanillaOres = gregtech.common.config.worldgen.ConfigGeneral.disableVanillaOres; + GT_Mod.gregtechproxy.mIncreaseDungeonLoot = ConfigGeneral.increaseDungeonLoot; + GT_Mod.gregtechproxy.mAxeWhenAdventure = ConfigGeneral.axeWhenAdventure; + GT_Mod.gregtechproxy.mSurvivalIntoAdventure = ConfigGeneral.survivalIntoAdventure; + GT_Mod.gregtechproxy.mHungerEffect = ConfigGeneral.hungerEffect; + GT_Mod.gregtechproxy.mInventoryUnification = ConfigGeneral.inventoryUnification; + GT_Mod.gregtechproxy.mGTBees = ConfigGeneral.GTBees; + GT_Mod.gregtechproxy.mCraftingUnification = ConfigGeneral.craftingUnification; + GT_Mod.gregtechproxy.mNerfedWoodPlank = ConfigGeneral.nerfedWoodPlank; + GT_Mod.gregtechproxy.mNerfedVanillaTools = ConfigGeneral.nerfedVanillaTools; + GT_Mod.gregtechproxy.mAchievements = ConfigGeneral.achievements; + GT_Mod.gregtechproxy.mHideUnusedOres = ConfigGeneral.hideUnusedOres; + GT_Mod.gregtechproxy.mEnableAllMaterials = ConfigGeneral.enableAllMaterials; + GT_Mod.gregtechproxy.mExplosionItemDrop = ConfigGeneral.explosionItemDrop; + GT_Mod.gregtechproxy.mEnableCleanroom = ConfigGeneral.enableCleanroom; + GT_Mod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() && ConfigGeneral.lowGravProcessing; + GT_Mod.gregtechproxy.mCropNeedBlock = ConfigGeneral.cropNeedBlock; + GT_Mod.gregtechproxy.mAMHInteraction = ConfigGeneral.autoMaintenaceHatchesInteraction; + GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = ConfigGeneral.mixedOreOnlyYieldsTwoThirdsOfPureOre; + GT_Mod.gregtechproxy.mRichOreYieldMultiplier = ConfigGeneral.richOreYieldMultiplier; + GT_Mod.gregtechproxy.mNetherOreYieldMultiplier = ConfigGeneral.netherOreYieldMultiplier; + GT_Mod.gregtechproxy.mEndOreYieldMultiplier = ConfigGeneral.endOreYieldMultiplier; + GT_Mod.gregtechproxy.gt6Pipe = ConfigGeneral.gt6Pipe; + GT_Mod.gregtechproxy.gt6Cable = ConfigGeneral.gt6Cable; + GT_Mod.gregtechproxy.ic2EnergySourceCompat = ConfigGeneral.ic2EnergySourceCompat; + GT_Mod.gregtechproxy.costlyCableConnection = ConfigGeneral.costlyCableConnection; + GT_Mod.gregtechproxy.crashOnNullRecipeInput = ConfigGeneral.crashOnNullRecipeInput; + if ((boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) { + GT_Mod.gregtechproxy.crashOnNullRecipeInput = false; // Use flags in GT_RecipeBuilder instead! + } + GT_LanguageManager.i18nPlaceholder = ConfigGeneral.i18nPlaceholder; + GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = ConfigGeneral.minimalDistancePoints; + GT_Values.mCTMEnabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMWhitelist)); + GT_Values.mCTMDisabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMBlacklist)); + if (ConfigGeneral.harderMobSpawner) { + Blocks.mob_spawner.setHardness(500.0F) + .setResistance(6000000.0F); } - GregTech_API.sMachineExplosions = tMainConfig.get("machines", "machines_explosion_damage", true) - .getBoolean(false); - GregTech_API.sMachineFlammable = tMainConfig.get("machines", "machines_flammable", true) - .getBoolean(false); - GregTech_API.sMachineNonWrenchExplosions = tMainConfig.get("machines", "explosions_on_nonwrenching", true) - .getBoolean(false); - GregTech_API.sMachineWireFire = tMainConfig.get("machines", "wirefire_on_explosion", true) - .getBoolean(false); - GregTech_API.sMachineFireExplosions = tMainConfig.get("machines", "fire_causes_explosions", true) - .getBoolean(false); - GregTech_API.sMachineRainExplosions = tMainConfig.get("machines", "rain_causes_explosions", true) - .getBoolean(false); - GregTech_API.sMachineThunderExplosions = tMainConfig.get("machines", "lightning_causes_explosions", true) - .getBoolean(false); - GregTech_API.sConstantEnergy = tMainConfig.get("machines", "constant_need_of_energy", true) - .getBoolean(false); - GregTech_API.sColoredGUI = tMainConfig.get("machines", "colored_guis_when_painted", true) - .getBoolean(false); - GregTech_API.sMachineMetalGUI = tMainConfig.get("machines", "guis_in_consistent_machine_metal_color", false) - .getBoolean(false); + // machines + GT_Values.ticksBetweenSounds = ConfigMachines.ticksBetweenSounds; + GT_Values.blacklistedTileEntiyClassNamesForWA = ConfigMachines.blacklistedTileEntiyClassNamesForWA; + GT_Values.cleanroomGlass = ConfigMachines.cleanroomGlass; + GT_Values.enableChunkloaders = ConfigMachines.enableChunkloaders; + GT_Values.alwaysReloadChunkloaders = ConfigMachines.alwaysReloadChunkloaders; + GT_Values.debugChunkloaders = ConfigDebug.debugChunkloaders; + GT_Values.disableDigitalChestsExternalAccess = ConfigMachines.disableDigitalChestsExternalAccess; + GT_Values.enableMultiTileEntities = ConfigMachines.enableMultiTileEntities + || (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + GregTech_API.sMachineExplosions = ConfigMachines.machineExplosions; + GregTech_API.sMachineFlammable = ConfigMachines.machineFlammable; + GregTech_API.sMachineNonWrenchExplosions = ConfigMachines.machineNonWrenchExplosions; + GregTech_API.sMachineWireFire = ConfigMachines.machineWireFire; + GregTech_API.sMachineFireExplosions = ConfigMachines.machineFireExplosions; + GregTech_API.sMachineRainExplosions = ConfigMachines.machineRainExplosions; + GregTech_API.sMachineThunderExplosions = ConfigMachines.machineThunderExplosions; + GregTech_API.sColoredGUI = ConfigMachines.coloredGUI; + GregTech_API.sMachineMetalGUI = ConfigMachines.machineMetalGUI; // Implementation for this is actually handled in NewHorizonsCoreMod in MainRegistry.java! - GregTech_API.sUseMachineMetal = tMainConfig.get("machines", "use_machine_metal_tint", true) - .getBoolean(true); - - GregTech_API.sTimber = tMainConfig.get(GT_Mod.aTextGeneral, "timber_axe", true) - .getBoolean(true); - GregTech_API.sDrinksAlwaysDrinkable = tMainConfig.get(GT_Mod.aTextGeneral, "drinks_always_drinkable", false) - .getBoolean(false); - GregTech_API.sDoShowAllItemsInCreative = tMainConfig - .get(GT_Mod.aTextGeneral, "show_all_metaitems_in_creative_and_NEI", false) - .getBoolean(false); - GregTech_API.sMultiThreadedSounds = tMainConfig.get(GT_Mod.aTextGeneral, "sound_multi_threading", false) - .getBoolean(false); + GregTech_API.sUseMachineMetal = ConfigMachines.useMachineMetal; + // client loadClientConfig(); - GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = tMainConfig - .get(GT_Mod.aTextGeneral, "MaxEqualEntitiesAtOneSpot", 3) - .getInt(3); - GT_Mod.gregtechproxy.mSkeletonsShootGTArrows = tMainConfig - .get(GT_Mod.aTextGeneral, "SkeletonsShootGTArrows", 16) - .getInt(16); - GT_Mod.gregtechproxy.mFlintChance = tMainConfig.get(GT_Mod.aTextGeneral, "FlintAndSteelChance", 30) - .getInt(30); - GT_Mod.gregtechproxy.mItemDespawnTime = tMainConfig.get(GT_Mod.aTextGeneral, "ItemDespawnTime", 6000) - .getInt(6000); - GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = tMainConfig - .get(GT_Mod.aTextGeneral, "AllowSmallBoilerAutomation", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mDisableVanillaOres = tMainConfig.get(GT_Mod.aTextGeneral, "DisableVanillaOres", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mIncreaseDungeonLoot = tMainConfig.get(GT_Mod.aTextGeneral, "IncreaseDungeonLoot", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mAxeWhenAdventure = tMainConfig.get(GT_Mod.aTextGeneral, "AdventureModeStartingAxe", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mSurvivalIntoAdventure = tMainConfig.get(GT_Mod.aTextGeneral, "forceAdventureMode", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mHungerEffect = tMainConfig.get(GT_Mod.aTextGeneral, "AFK_Hunger", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mInventoryUnification = tMainConfig.get(GT_Mod.aTextGeneral, "InventoryUnification", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mGTBees = tMainConfig.get(GT_Mod.aTextGeneral, "GTBees", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mCraftingUnification = tMainConfig.get(GT_Mod.aTextGeneral, "CraftingUnification", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mNerfedWoodPlank = tMainConfig.get(GT_Mod.aTextGeneral, "WoodNeedsSawForCrafting", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mNerfedVanillaTools = tMainConfig - .get(GT_Mod.aTextGeneral, "smallerVanillaToolDurability", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mAchievements = tMainConfig.get(GT_Mod.aTextGeneral, "EnableAchievements", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mHideUnusedOres = tMainConfig.get(GT_Mod.aTextGeneral, "HideUnusedOres", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mEnableAllMaterials = tMainConfig.get("general", "EnableAllMaterials", false) - .getBoolean(false); - - // Pollution: edit GT_Proxy.java to change default values - GT_Mod.gregtechproxy.mPollution = tMainConfig - .get("Pollution", "EnablePollution", GT_Mod.gregtechproxy.mPollution) - .getBoolean(GT_Mod.gregtechproxy.mPollution); - GT_Mod.gregtechproxy.mPollutionSmogLimit = tMainConfig - .get("Pollution", "SmogLimit", GT_Mod.gregtechproxy.mPollutionSmogLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionSmogLimit); - GT_Mod.gregtechproxy.mPollutionPoisonLimit = tMainConfig - .get("Pollution", "PoisonLimit", GT_Mod.gregtechproxy.mPollutionPoisonLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionPoisonLimit); - GT_Mod.gregtechproxy.mPollutionVegetationLimit = tMainConfig - .get("Pollution", "VegetationLimit", GT_Mod.gregtechproxy.mPollutionVegetationLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionVegetationLimit); - GT_Mod.gregtechproxy.mPollutionSourRainLimit = tMainConfig - .get("Pollution", "SourRainLimit", GT_Mod.gregtechproxy.mPollutionSourRainLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionSourRainLimit); - GT_Mod.gregtechproxy.mPollutionOnExplosion = tMainConfig - .get("Pollution", "SourRainLimit", GT_Mod.gregtechproxy.mPollutionOnExplosion) - .getInt(GT_Mod.gregtechproxy.mPollutionOnExplosion); - GT_Mod.gregtechproxy.mExplosionItemDrop = tMainConfig - .get("general", "ExplosionItemDrops", GT_Mod.gregtechproxy.mExplosionItemDrop) - .getBoolean(GT_Mod.gregtechproxy.mExplosionItemDrop); - GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = tMainConfig - .get( - "Pollution", - "PollutionPrimitiveBlastFurnace", - GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond); - GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond = tMainConfig - .get("Pollution", "PollutionCharcoalPit", GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond); - GT_Mod.gregtechproxy.mPollutionEBFPerSecond = tMainConfig - .get("Pollution", "PollutionEBF", GT_Mod.gregtechproxy.mPollutionEBFPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionEBFPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeCombustionEngine", - GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond); - GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = tMainConfig - .get( - "Pollution", - "PollutionExtremeCombustionEngine", - GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond); - GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond = tMainConfig - .get( - "Pollution", - "PollutionImplosionCompressor", - GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = tMainConfig - .get("Pollution", "PollutionLargeBronzeBoiler", GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = tMainConfig - .get("Pollution", "PollutionLargeSteelBoiler", GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeTitaniumBoiler", - GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeTungstenSteelBoiler", - GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionReleasedByThrottle = tMainConfig - .get("Pollution", "PollutionReleasedByThrottle", GT_Mod.gregtechproxy.mPollutionReleasedByThrottle) - .getDouble(GT_Mod.gregtechproxy.mPollutionReleasedByThrottle); - GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = tMainConfig - .get("Pollution", "PollutionLargeGasTurbine", GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond); - GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond = tMainConfig - .get("Pollution", "PollutionMultiSmelter", GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond); - GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = tMainConfig - .get("Pollution", "PollutionPyrolyseOven", GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond); - GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = tMainConfig - .get("Pollution", "PollutionSmallCoalBoiler", GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionHighPressureLavaBoiler", - GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionHighPressureCoalBoiler", - GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = tMainConfig - .get( - "Pollution", - "PollutionBaseDieselGenerator", - GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond); - double[] mPollutionDieselGeneratorReleasedByTier = tMainConfig - .get( - "Pollution", - "PollutionReleasedByTierDieselGenerator", - GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier) - .getDoubleList(); + // Pollution + GT_Mod.gregtechproxy.mPollution = ConfigPollution.pollution; + GT_Mod.gregtechproxy.mPollutionSmogLimit = ConfigPollution.pollutionSmogLimit; + GT_Mod.gregtechproxy.mPollutionPoisonLimit = ConfigPollution.pollutionPoisonLimit; + GT_Mod.gregtechproxy.mPollutionVegetationLimit = ConfigPollution.pollutionVegetationLimit; + GT_Mod.gregtechproxy.mPollutionSourRainLimit = ConfigPollution.pollutionSourRainLimit; + GT_Mod.gregtechproxy.mPollutionOnExplosion = ConfigPollution.pollutionOnExplosion; + GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = ConfigPollution.pollutionPrimitveBlastFurnacePerSecond; + GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond = ConfigPollution.pollutionCharcoalPitPerSecond; + GT_Mod.gregtechproxy.mPollutionEBFPerSecond = ConfigPollution.pollutionEBFPerSecond; + GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = ConfigPollution.pollutionLargeCombustionEnginePerSecond; + GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = ConfigPollution.pollutionExtremeCombustionEnginePerSecond; + GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond = ConfigPollution.pollutionImplosionCompressorPerSecond; + GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = ConfigPollution.pollutionLargeBronzeBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = ConfigPollution.pollutionLargeSteelBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = ConfigPollution.pollutionLargeTitaniumBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = ConfigPollution.pollutionLargeTungstenSteelBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionReleasedByThrottle = ConfigPollution.pollutionReleasedByThrottle; + GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = ConfigPollution.pollutionLargeGasTurbinePerSecond; + GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond = ConfigPollution.pollutionMultiSmelterPerSecond; + GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = ConfigPollution.pollutionPyrolyseOvenPerSecond; + GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = ConfigPollution.pollutionSmallCoalBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = ConfigPollution.pollutionHighPressureLavaBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = ConfigPollution.pollutionHighPressureCoalBoilerPerSecond; + GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = ConfigPollution.pollutionBaseDieselGeneratorPerSecond; + double[] mPollutionDieselGeneratorReleasedByTier = ConfigPollution.pollutionDieselGeneratorReleasedByTier; if (mPollutionDieselGeneratorReleasedByTier.length == GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) { GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier; @@ -642,18 +497,8 @@ public class GT_PreLoad { GT_FML_LOGGER .error("The Length of the Diesel Turbine Pollution Array Config must be the same as the Default"); } - GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = tMainConfig - .get( - "Pollution", - "PollutionBaseGasTurbineGenerator", - GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond); - double[] mPollutionGasTurbineReleasedByTier = tMainConfig - .get( - "Pollution", - "PollutionReleasedByTierGasTurbineGenerator", - GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier) - .getDoubleList(); + GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = ConfigPollution.pollutionBaseGasTurbinePerSecond; + double[] mPollutionGasTurbineReleasedByTier = ConfigPollution.pollutionGasTurbineReleasedByTier; if (mPollutionGasTurbineReleasedByTier.length == GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) { GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier; @@ -661,223 +506,107 @@ public class GT_PreLoad { GT_FML_LOGGER.error("The Length of the Gas Turbine Pollution Array Config must be the same as the Default"); } - GT_Mod.gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid"); - GT_Mod.gregtechproxy.enableUndergroundGravelGen = GregTech_API.sWorldgenFile - .get("general", "enableUndergroundGravelGen", GT_Mod.gregtechproxy.enableUndergroundGravelGen); - GT_Mod.gregtechproxy.enableUndergroundDirtGen = GregTech_API.sWorldgenFile - .get("general", "enableUndergroundDirtGen", GT_Mod.gregtechproxy.enableUndergroundDirtGen); - GT_Mod.gregtechproxy.mEnableCleanroom = tMainConfig.get("general", "EnableCleanroom", true) - .getBoolean(true); - if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(tMainConfig); - GT_Mod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() - && tMainConfig.get("general", "LowGravProcessing", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList = tMainConfig - .get("general", "GTNH Optimised Material Loading", true) - .getBoolean(true); - Calendar now = Calendar.getInstance(); - GT_Mod.gregtechproxy.mAprilFool = GregTech_API.sSpecialFile.get( - ConfigCategories.general, - "AprilFool", - now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) == 1); - GT_Mod.gregtechproxy.mCropNeedBlock = tMainConfig.get("general", "CropNeedBlockBelow", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mAMHInteraction = tMainConfig.get("general", "AllowAutoMaintenanceHatchInteraction", false) - .getBoolean(false); - GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); - GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); - GregTech_API.mEUtoRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "100EUtoRF", 360); - GregTech_API.mRFtoEU = GregTech_API.sOPStuff.get(ConfigCategories.general, "100RFtoEU", 20); - GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false); - GregTech_API.meIOLoaded = EnderIO.isModLoaded(); - GT_Mod.gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "forceFreeFace", true); - GT_Mod.gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true) - .getBoolean(true); - - GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig - .get("general", "MixedOreOnlyYieldsTwoThirdsOfPureOre", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mRichOreYieldMultiplier = tMainConfig.get("general", "RichOreYieldMultiplier", true) - .getBoolean(false); - GT_Mod.gregtechproxy.mNetherOreYieldMultiplier = tMainConfig.get("general", "NetherOreYieldMultiplier", true) - .getBoolean(false); - GT_Mod.gregtechproxy.mEndOreYieldMultiplier = tMainConfig.get("general", "EndOreYieldMultiplier", true) - .getBoolean(false); - GT_Mod.gregtechproxy.enableBlackGraniteOres = GregTech_API.sWorldgenFile - .get("general", "enableBlackGraniteOres", GT_Mod.gregtechproxy.enableBlackGraniteOres); - GT_Mod.gregtechproxy.enableRedGraniteOres = GregTech_API.sWorldgenFile - .get("general", "enableRedGraniteOres", GT_Mod.gregtechproxy.enableRedGraniteOres); - GT_Mod.gregtechproxy.enableMarbleOres = GregTech_API.sWorldgenFile - .get("general", "enableMarbleOres", GT_Mod.gregtechproxy.enableMarbleOres); - GT_Mod.gregtechproxy.enableBasaltOres = GregTech_API.sWorldgenFile - .get("general", "enableBasaltOres", GT_Mod.gregtechproxy.enableBasaltOres); - GT_Mod.gregtechproxy.gt6Pipe = tMainConfig.get("general", "GT6StyledPipesConnection", true) - .getBoolean(true); - GT_Mod.gregtechproxy.gt6Cable = tMainConfig.get("general", "GT6StyledWiresConnection", true) - .getBoolean(true); - GT_Mod.gregtechproxy.ic2EnergySourceCompat = tMainConfig.get("general", "Ic2EnergySourceCompat", true) - .getBoolean(true); - GT_Mod.gregtechproxy.costlyCableConnection = tMainConfig - .get("general", "CableConnectionRequiresSolderingMaterial", false) - .getBoolean(false); - GT_Mod.gregtechproxy.crashOnNullRecipeInput = tMainConfig.get("general", "crashOnNullRecipeInput", false) - .getBoolean(false); - GT_LanguageManager.i18nPlaceholder = tMainConfig - .get("general", "EnablePlaceholderForMaterialNamesInLangFile", true) - .getBoolean(true); - GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = tMainConfig - .get("general", "LongDistancePipelineMinimalDistancePoints", 64) - .getInt(64); - try { - String setting_string = tMainConfig.get( - "OreDropBehaviour", - "general", - "FortuneItem", - "Settings: \n'PerDimBlock': Sets the drop to the block variant of the ore block based on dimension, defaults to stone type, \n'UnifiedBlock': Sets the drop to the stone variant of the ore block, \n'Block': Sets the drop to the ore mined, \n'FortuneItem': Sets the drop to the new ore item and makes it affected by fortune, \n'Item': Sets the drop to the new ore item, \nDefaults to: 'FortuneItem'") - .getString(); - GT_Log.out.println("Trying to set it to: " + setting_string); - GT_Proxy.OreDropSystem setting = GT_Proxy.OreDropSystem.valueOf(setting_string); - GT_Mod.gregtechproxy.oreDropSystem = setting; + // cleanroom file + if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(GT_Config.cleanroomFile); + + // underground fluids file + GT_Mod.gregtechproxy.mUndergroundOil.getConfig(GT_Config.undergroundFluidsFile, "undergroundfluid"); + + // Worldgeneration.cfg + GT_Mod.gregtechproxy.enableUndergroundGravelGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundGravelGen; + GT_Mod.gregtechproxy.enableUndergroundDirtGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundDirtGen; + GT_Mod.gregtechproxy.enableBlackGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres; + GT_Mod.gregtechproxy.enableRedGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres; + GT_Mod.gregtechproxy.enableMarbleOres = gregtech.common.config.worldgen.ConfigGeneral.generateMarbleOres; + GT_Mod.gregtechproxy.enableBasaltOres = gregtech.common.config.worldgen.ConfigGeneral.generateBasaltOres; + + // OverpoweredStuff.cfg + GregTech_API.mOutputRF = gregtech.common.config.opstuff.ConfigGeneral.outputRF; + GregTech_API.mInputRF = gregtech.common.config.opstuff.ConfigGeneral.inputRF; + GregTech_API.mEUtoRF = gregtech.common.config.opstuff.ConfigGeneral.howMuchRFWith100EUInInput; + GregTech_API.mRFtoEU = gregtech.common.config.opstuff.ConfigGeneral.howMuchEUWith100RFInInput; + GregTech_API.mRFExplosions = gregtech.common.config.opstuff.ConfigGeneral.RFExplosions; + + // MachineStats.cfg + GT_Mod.gregtechproxy.mForceFreeFace = gregtech.common.config.machinestats.ConfigMachines.forceFreeFace; + // ore_drop_behavior + try { + GT_Log.out.println("Trying to set it to: " + ConfigOreDropBehavior.setting); + GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.valueOf(ConfigOreDropBehavior.setting);; } catch (IllegalArgumentException e) { GT_Log.err.println(e); GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.FortuneItem; } - GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties - .get("havestLevel", "activateHarvestLevelChange", false); // TODO CHECK - if (GT_Mod.gregtechproxy.mChangeHarvestLevels) { - GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties - .get("havestLevel", "graniteHarvestLevel", 3); - GT_Mod.gregtechproxy.mMaxHarvestLevel = Math - .min(15, GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel", 7)); - Materials.getMaterialsMap() - .values() - .parallelStream() - .filter( - tMaterial -> tMaterial != null && tMaterial.mToolQuality > 0 - && tMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length - && tMaterial.mMetaItemSubID >= 0) - .forEach( - tMaterial -> GT_Mod.gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties - .get("materialHavestLevel", tMaterial.mDefaultLocalName, tMaterial.mToolQuality)); - } - - if (tMainConfig.get("general", "hardermobspawners", true) - .getBoolean(true)) { - Blocks.mob_spawner.setHardness(500.0F) - .setResistance(6000000.0F); - } - - GT_Mod.gregtechproxy.mUpgradeCount = Math.min( - 64, - Math.max( - 1, - tMainConfig.get("features", "UpgradeStacksize", 4) - .getInt())); + // features + GT_Mod.gregtechproxy.mUpgradeCount = Math.min(64, Math.max(1, ConfigFeatures.upgradeStackSize)); for (OrePrefixes tPrefix : OrePrefixes.values()) { if (tPrefix.mIsUsedForOreProcessing) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 1, - tMainConfig.get("features", "MaxOreStackSize", 64) - .getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(1, ConfigFeatures.maxOreStackSize))); } else if (tPrefix == OrePrefixes.plank) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 16, - tMainConfig.get("features", "MaxPlankStackSize", 64) - .getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(16, ConfigFeatures.maxPlankStackSize))); } else if ((tPrefix == OrePrefixes.wood) || (tPrefix == OrePrefixes.treeLeaves) || (tPrefix == OrePrefixes.treeSapling) || (tPrefix == OrePrefixes.log)) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 16, - tMainConfig.get("features", "MaxLogStackSize", 64) - .getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(16, ConfigFeatures.maxLogStackSize))); } else if (tPrefix.mIsUsedForBlocks) { - tPrefix.mDefaultStackSize = ((byte) Math.min( - 64, - Math.max( - 16, - tMainConfig.get("features", "MaxOtherBlockStackSize", 64) - .getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math + .min(64, Math.max(16, ConfigFeatures.maxOtherBlocksStackSize))); } } - GT_Values.mCTMEnabledBlock - .addAll( - Arrays - .asList( - tMainConfig - .get( - "general", - "ctm_block_whitelist", - new String[] { "team.chisel.block.BlockCarvable", - "team.chisel.block.BlockCarvableGlass" }) - .getStringList())); - GT_Values.mCTMDisabledBlock.addAll( - Arrays.asList( - tMainConfig.get("general", "ctm_block_blacklist", new String[] { "team.chisel.block.BlockRoadLine" }) - .getStringList())); - GT_RecipeBuilder.onConfigLoad(); } + public static void parseHex(Dyes dye, String hexString) { + dye.mRGBa[0] = Short.parseShort(hexString.substring(1, 3), 16); + dye.mRGBa[1] = Short.parseShort(hexString.substring(3, 5), 16); + dye.mRGBa[2] = Short.parseShort(hexString.substring(5), 16); + } + public static void loadClientConfig() { - final String sBDye0 = "ColorModulation."; Arrays.stream(Dyes.values()) - .filter(tDye -> (tDye != Dyes._NULL) && (tDye.mIndex < 0)) - .forEach(tDye -> { - String sBDye1 = sBDye0 + tDye; - tDye.mRGBa[0] = ((short) Math - .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "R", tDye.mOriginalRGBa[0])))); - tDye.mRGBa[1] = ((short) Math - .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "G", tDye.mOriginalRGBa[1])))); - tDye.mRGBa[2] = ((short) Math - .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "B", tDye.mOriginalRGBa[2])))); + .filter(dye -> (dye != Dyes._NULL) && (dye.mIndex < 0)) + .forEach(dye -> { + switch (dye.toString() + .toLowerCase()) { + case "cable_insulation" -> parseHex(dye, ConfigColorModulation.cableInsulation); + case "construction_foam" -> parseHex(dye, ConfigColorModulation.constructionFoam); + case "machine_metal" -> parseHex(dye, ConfigColorModulation.machineMetal); + default -> { + GT_FML_LOGGER.warn( + "unknown color modulation entry: " + dye + + ". Report this pls, as config is missing this entry being parsed in code."); + } + } }); - GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = GregTech_API.sClientDataFile - .get("render", "TileAmbientOcclusion", true); - GT_Mod.gregtechproxy.mRenderGlowTextures = GregTech_API.sClientDataFile.get("render", "GlowTextures", true); - GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = GregTech_API.sClientDataFile - .get("render", "RenderFlippedMachinesFlipped", true); - GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = GregTech_API.sClientDataFile - .get("render", "RenderIndicatorsOnHatch", true); - GT_Mod.gregtechproxy.mRenderDirtParticles = GregTech_API.sClientDataFile - .get("render", "RenderDirtParticles", true); - GT_Mod.gregtechproxy.mRenderPollutionFog = GregTech_API.sClientDataFile - .get("render", "RenderPollutionFog", true); - GT_Mod.gregtechproxy.mRenderItemDurabilityBar = GregTech_API.sClientDataFile - .get("render", "RenderItemDurabilityBar", true); - GT_Mod.gregtechproxy.mRenderItemChargeBar = GregTech_API.sClientDataFile - .get("render", "RenderItemChargeBar", true); - GT_Mod.gregtechproxy.mUseBlockUpdateHandler = GregTech_API.sClientDataFile - .get("render", "UseBlockUpdateHandler", false); - - GT_Mod.gregtechproxy.mCoverTabsVisible = GregTech_API.sClientDataFile - .get("interface", "DisplayCoverTabs", true); - GT_Mod.gregtechproxy.mCoverTabsFlipped = GregTech_API.sClientDataFile.get("interface", "FlipCoverTabs", false); - GT_Mod.gregtechproxy.mTooltipVerbosity = GregTech_API.sClientDataFile.get("interface", "TooltipVerbosity", 2); - GT_Mod.gregtechproxy.mTooltipShiftVerbosity = GregTech_API.sClientDataFile - .get("interface", "TooltipShiftVerbosity", 3); - GT_Mod.gregtechproxy.mTitleTabStyle = GregTech_API.sClientDataFile.get("interface", "TitleTabStyle", 0); - - GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.sClientDataFile.get("nei", "RecipeSecondMode", true); - GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.sClientDataFile.get("nei", "RecipeOwner", false); - GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.sClientDataFile + GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = ConfigRender.renderTileAmbientOcclusion; + GT_Mod.gregtechproxy.mRenderGlowTextures = ConfigRender.renderGlowTextures; + GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = ConfigRender.renderFlippedMachinesFlipped; + GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = ConfigRender.renderIndicatorsOnHatch; + GT_Mod.gregtechproxy.mRenderDirtParticles = ConfigRender.renderDirtParticles; + GT_Mod.gregtechproxy.mRenderPollutionFog = ConfigRender.renderPollutionFog; + GT_Mod.gregtechproxy.mRenderItemDurabilityBar = ConfigRender.renderItemDurabilityBar; + GT_Mod.gregtechproxy.mRenderItemChargeBar = ConfigRender.renderItemChargeBar; + GT_Mod.gregtechproxy.mUseBlockUpdateHandler = ConfigRender.useBlockUpdateHandler; + + GT_Mod.gregtechproxy.mCoverTabsVisible = ConfigInterface.coverTabsVisible; + GT_Mod.gregtechproxy.mCoverTabsFlipped = ConfigInterface.coverTabsFlipped; + GT_Mod.gregtechproxy.mTooltipVerbosity = ConfigInterface.tooltipVerbosity; + GT_Mod.gregtechproxy.mTooltipShiftVerbosity = ConfigInterface.tooltipShiftVerbosity; + GT_Mod.gregtechproxy.mTitleTabStyle = ConfigInterface.titleTabStyle; + + GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.NEIClientFIle.get("nei", "RecipeSecondMode", true); + GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.NEIClientFIle.get("nei", "RecipeOwner", false); + GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.NEIClientFIle .get("nei", "RecipeOwnerStackTrace", false); - GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.sClientDataFile.get("nei", "OriginalVoltage", false); + GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.NEIClientFIle.get("nei", "OriginalVoltage", false); GT_Mod.gregtechproxy.recipeCategorySettings.clear(); for (RecipeCategory recipeCategory : findRecipeCategories()) { RecipeCategorySetting setting = RecipeCategorySetting.find( - GregTech_API.sClientDataFile.getWithValidValues( + GregTech_API.NEIClientFIle.getWithValidValues( "nei.recipe_categories", recipeCategory.unlocalizedName, RecipeCategorySetting.NAMES, @@ -886,15 +615,8 @@ public class GT_PreLoad { GT_Mod.gregtechproxy.recipeCategorySettings.put(recipeCategory, setting); } - GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = GregTech_API.sClientDataFile - .get("waila", "WailaTransformerVoltageTier", true); - GT_Mod.gregtechproxy.wailaAverageNS = GregTech_API.sClientDataFile.get("waila", "WailaAverageNS", false); - - final String[] Circuits = GregTech_API.sClientDataFile.get("interface", "CircuitsOrder"); - GT_Mod.gregtechproxy.mCircuitsOrder.clear(); - for (int i = 0; i < Circuits.length; i++) { - GT_Mod.gregtechproxy.mCircuitsOrder.putIfAbsent(Circuits[i], i); - } + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = ConfigWaila.wailaTransformerVoltageTier; + GT_Mod.gregtechproxy.wailaAverageNS = ConfigWaila.wailaAverageNS; GT_Mod.gregtechproxy.reloadNEICache(); } |