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/postload | |
| 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/postload')
3 files changed, 19 insertions, 2384 deletions
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, - f |
