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/com | |
| 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/com')
6 files changed, 36 insertions, 175 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java index f394089fb0..015d736321 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java @@ -34,7 +34,6 @@ import gregtech.api.enums.Materials; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.util.GT_Config; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; @@ -59,7 +58,7 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override @SuppressWarnings("rawtypes") - public void onConfigLoad(GT_Config aConfig) { + public void onConfigLoad() { try { Class c = TileEntityNuclearReactorElectric.class; Field f = c.getDeclaredField("huOutputModifier"); @@ -69,7 +68,7 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { | IllegalAccessException | NoSuchFieldException e) { e.printStackTrace(); } - super.onConfigLoad(aConfig); + super.onConfigLoad(); } @Override diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java index 6e0f0543e4..7b70fedfbf 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128b.java @@ -36,7 +36,6 @@ import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Thorianit; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.VanadioOxyDravit; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Wittichenit; -import static com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy.uo_dimensionList; import static gregtech.api.enums.Materials.Bismuth; import static gregtech.api.enums.Materials.Coal; import static gregtech.api.enums.Materials.Diamond; @@ -51,8 +50,6 @@ import static gregtech.api.enums.Materials.Uraninite; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidRegistry; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; @@ -193,19 +190,6 @@ public class BW_WorldGenRoss128b extends BW_OreLayer { FuchsitCR); } - public static void initundergroundFluids() { - String ross128b = StatCollector.translateToLocal("planet.Ross128b"); - uo_dimensionList.SetConfigValues(ross128b, ross128b, "veryheavyoil", "liquid_extra_heavy_oil", 0, 625, 40, 5); - uo_dimensionList - .SetConfigValues(ross128b, ross128b, "lava", FluidRegistry.getFluidName(FluidRegistry.LAVA), 0, 820, 5, 5); - uo_dimensionList.SetConfigValues(ross128b, ross128b, "gas_natural_gas", "gas_natural_gas", 0, 625, 65, 5); - } - - @Override - public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) { - return aDimensionType == ConfigHandler.ross128BID; - } - @Override public boolean isGenerationAllowed(String aDimName, int aDimensionType, int aAllowedDimensionType) { return aDimensionType == ConfigHandler.ross128BID; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java index 7454b0dd93..b854f771ca 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/oregen/BW_WorldGenRoss128ba.java @@ -32,21 +32,17 @@ import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Tiberium; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.VanadioOxyDravit; import static com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader.Wittichenit; -import static com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy.uo_dimensionList; import static gregtech.api.enums.Materials.Amethyst; import static gregtech.api.enums.Materials.Barite; import static gregtech.api.enums.Materials.Galena; -import static gregtech.api.enums.Materials.Helium_3; import static gregtech.api.enums.Materials.NaquadahEnriched; import static gregtech.api.enums.Materials.Olivine; -import static gregtech.api.enums.Materials.SaltWater; import static gregtech.api.enums.Materials.Scheelite; import static gregtech.api.enums.Materials.Sphalerite; import static gregtech.api.enums.Materials.Tetrahedrite; import net.minecraft.block.Block; import net.minecraft.util.StatCollector; -import net.minecraft.world.World; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; @@ -178,41 +174,6 @@ public class BW_WorldGenRoss128ba extends BW_OreLayer { Barite); } - public static void init_undergroundFluids() { - String ross128b = StatCollector.translateToLocal("moon.Ross128ba"); - uo_dimensionList.SetConfigValues( - ross128b, - ross128b, - SaltWater.getFluid(1) - .getFluid() - .getName(), - SaltWater.getFluid(1) - .getFluid() - .getName(), - 0, - 1250, - 40, - 5); - uo_dimensionList.SetConfigValues( - ross128b, - ross128b, - Helium_3.getGas(1) - .getFluid() - .getName(), - Helium_3.getGas(1) - .getFluid() - .getName(), - 0, - 1250, - 60, - 5); - } - - @Override - public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) { - return aDimensionType == ConfigHandler.ross128BAID; - } - @Override public boolean isGenerationAllowed(String aDimName, int aDimensionType, int aAllowedDimensionType) { return aDimensionType == ConfigHandler.ross128BAID; diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java index 5254da24f1..6fb6eb3b18 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/VoidMinerUtility.java @@ -23,8 +23,6 @@ import bloodasp.galacticgreg.GT_Worldgen_GT_Ore_SmallPieces_Space; import bloodasp.galacticgreg.GalacticGreg; import bloodasp.galacticgreg.api.ModContainer; import bloodasp.galacticgreg.api.ModDimensionDef; -import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_Layer_Space; -import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_SmallOre_Space; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; @@ -182,11 +180,7 @@ public class VoidMinerUtility { case -1 -> gt_worldgen -> gt_worldgen.mNether; case 0 -> gt_worldgen -> gt_worldgen.mOverworld; case 1 -> gt_worldgen -> gt_worldgen.mEnd || gt_worldgen.mEndAsteroid; - /* - * explicitly giving different dim numbers so that it default to false in the config, keeping compat with - * the current worldgen config - */ - case 7 -> gt_worldgen -> gt_worldgen.isGenerationAllowed("Twilight Forest", 0, 7); + case 7 -> gt_worldgen -> gt_worldgen.twilightForest; default -> throw new IllegalStateException(); }; } @@ -201,11 +195,7 @@ public class VoidMinerUtility { case -1 -> gt_worldgen -> gt_worldgen.mNether; case 0 -> gt_worldgen -> gt_worldgen.mOverworld; case 1 -> gt_worldgen -> gt_worldgen.mEnd; - /* - * explicitly giving different dim numbers so that it default to false in the config, keeping compat with - * the current worldgen config - */ - case 7 -> gt_worldgen -> gt_worldgen.isGenerationAllowed("Twilight Forest", 0, 7); + case 7 -> gt_worldgen -> gt_worldgen.twilightForest; default -> throw new IllegalStateException(); }; } @@ -259,34 +249,6 @@ public class VoidMinerUtility { && oreSmallPiecesSpace.isEnabledForDim(finalDef)) .map(gt_worldgen -> (GT_Worldgen_GT_Ore_SmallPieces_Space) gt_worldgen) .forEach(element -> dropMap.addDrop(element.mMeta, element.mAmount, false)); - - // BW Ore Veins - try { - GalacticGreg.oreVeinWorldgenList.stream() - .filter( - gt_worldgen -> gt_worldgen.mEnabled - && gt_worldgen instanceof BW_Worldgen_Ore_Layer_Space oreLayerSpace - && oreLayerSpace.isEnabledForDim(finalDef)) - .map(gt_worldgen -> (BW_Worldgen_Ore_Layer_Space) gt_worldgen) - .forEach(oreLayer -> { - List<ItemStack> data = oreLayer.getStacks(); - dropMap.addDrop(data.get(0), oreLayer.mWeight); - dropMap.addDrop(data.get(1), oreLayer.mWeight); - dropMap.addDrop(data.get(2), oreLayer.mWeight / 8f); - dropMap.addDrop(data.get(3), oreLayer.mWeight / 8f); - }); - } catch (NullPointerException ignored) {} - - // BW Small Ores - try { - GalacticGreg.smallOreWorldgenList.stream() - .filter( - gt_worldgen -> gt_worldgen.mEnabled - && gt_worldgen instanceof BW_Worldgen_Ore_SmallOre_Space smallOreSpace - && smallOreSpace.isEnabledForDim(finalDef)) - .map(gt_worldgen -> (BW_Worldgen_Ore_SmallOre_Space) gt_worldgen) - .forEach(element -> dropMap.addDrop(element.mPrimaryMeta, element.mDensity, element.bwOres != 0)); - } catch (NullPointerException ignored) {} return dropMap; } diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java index 972254e2d9..e203246058 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java @@ -13,10 +13,7 @@ package com.github.bartimaeusnek.crossmod.galacticraft; -import java.io.File; - import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; @@ -28,13 +25,9 @@ import com.github.bartimaeusnek.crossmod.galacticraft.solarsystems.Ross128SolarS import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import gregtech.api.objects.GT_UO_DimensionList; public class GalacticraftProxy { - public static GT_UO_DimensionList uo_dimensionList = new GT_UO_DimensionList(); - static Configuration gtConf; - private GalacticraftProxy() {} public static void postInit(FMLPostInitializationEvent e) { @@ -60,12 +53,6 @@ public class GalacticraftProxy { private static void clientpreInit(FMLPreInitializationEvent e) {} private static void commonpreInit(FMLPreInitializationEvent e) { - GalacticraftProxy.gtConf = new Configuration( - new File(new File(e.getModConfigurationDirectory(), "GregTech"), "GregTech.cfg")); - GalacticraftProxy.uo_dimensionList.getConfig(GalacticraftProxy.gtConf, "undergroundfluid"); - BW_WorldGenRoss128b.initundergroundFluids(); - BW_WorldGenRoss128ba.init_undergroundFluids(); - if (GalacticraftProxy.gtConf.hasChanged()) GalacticraftProxy.gtConf.save(); BW_WorldGenRoss128b.initOres(); BW_WorldGenRoss128ba.init_Ores(); MinecraftForge.EVENT_BUS.register(BWAtmosphereManager.INSTANCE); diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index cc7de26fb6..5813c3385d 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -206,70 +206,38 @@ public class EyeOfHarmonyRecipe { } private ItemStack getStoneDustType(String key) { - - switch (key) { - case "Ne": - return GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1); - case "ED": - case "VA": - case "EA": - return GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1); - case "Mo": - return getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1); - case "De": - return getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1); - case "Ma": - return getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1); - case "Ph": - return getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1); - case "As": - case "KB": - return getModItem(NewHorizonsCoreMod.ID, "item.AsteroidsStoneDust", 1); - case "Ca": - return getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1); - case "Ce": - return getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1); - case "Eu": - return getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1); - case "Ga": - return getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1); - case "Io": - return getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1); - case "Me": - return getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1); - case "Ve": - return getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1); - case "En": - return getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1); - case "Mi": - return getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1); - case "Ob": - return getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1); - case "Ti": - return getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1); - case "Pr": - return getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1); - case "Tr": - return getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1); - case "Ha": - return getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1); - case "MM": - return getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1); - case "Pl": - return getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1); - case "BE": - return getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1); - case "BF": - return getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1); - case "CB": - return getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1); - case "TE": - return getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1); - case "VB": - return getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1); - default: - return GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1); - } + ItemStack placeholder = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1); + return switch (key) { + case "Ne" -> GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1); + case "ED", "VA", "EA" -> GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1); + case "Mo" -> getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, placeholder); + case "De" -> getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, placeholder); + case "Ma" -> getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, placeholder); + case "Ph" -> getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, placeholder); + case "As", "KB" -> getModItem(NewHorizonsCoreMod.ID, "item.AsteroidsStoneDust", 1, placeholder); + case "Ca" -> getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, placeholder); + case "Ce" -> getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, placeholder); + case "Eu" -> getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, placeholder); + case "Ga" -> getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, placeholder); + case "Io" -> getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, placeholder); + case "Me" -> getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1, placeholder); + case "Ve" -> getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1, placeholder); + case "En" -> getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, placeholder); + case "Mi" -> getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, placeholder); + case "Ob" -> getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, placeholder); + case "Ti" -> getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, placeholder); + case "Pr" -> getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, placeholder); + case "Tr" -> getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, placeholder); + case "Ha" -> getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, placeholder); + case "MM" -> getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, placeholder); + case "Pl" -> getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, placeholder); + case "BE" -> getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, placeholder); + case "BF" -> getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, placeholder); + case "CB" -> getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1, placeholder); + case "TE" -> getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, placeholder); + case "VB" -> getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, placeholder); + default -> placeholder; + }; } public EyeOfHarmonyRecipe(final GT5OreLayerHelper.NormalOreDimensionWrapper normalOreDimensionWrapper, |
