diff options
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, - |