Skip to content

Move all config options shared across all MMDLib users to MMDLib #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jriwanek merged 3 commits into from
Apr 25, 2019
Merged

Move all config options shared across all MMDLib users to MMDLib #436

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
465806a
the JEI stuff is in MMDLib, not BaseMetals - moved there
dshadowwolf Apr 24, 2019
593990e
move almost all of the bits from the 'general' config category out to…
dshadowwolf Apr 24, 2019
5ee96fb
Merge branch 'master-1.12' of github.com:MinecraftModDevelopmentMods/…
dshadowwolf Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 1 addition & 37 deletions src/main/java/com/mcmoddev/basemetals/util/BMeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@

import com.mcmoddev.basemetals.BaseMetals;
import com.mcmoddev.basemetals.data.MaterialNames;
import com.mcmoddev.lib.data.ConfigKeys;
import com.mcmoddev.lib.integration.plugins.*;
import com.mcmoddev.lib.util.Config;
import com.mcmoddev.lib.util.IntegrationConfigOptions;
import com.mcmoddev.lib.util.MaterialConfigOptions;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.ConfigCategory;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;

Expand All @@ -25,8 +20,6 @@ public final class BMeConfig extends Config {
private static Configuration configuration;
private static final String CONFIG_FILE = "config/BaseMetals.cfg";
private static final String GENERAL_CAT = "General";
private static final String HAMMER_RECIPES_CAT = "Crack Hammer Recipes";
private static final String TOOLS_CAT = "Tools and Items";

private static final MaterialConfigOptions[] MATERIAL_CONFIG_OPTIONS = new MaterialConfigOptions[]{
// Base Metals
Expand Down Expand Up @@ -54,19 +47,6 @@ public final class BMeConfig extends Config {
new MaterialConfigOptions(MaterialNames.ZINC, false, true, true, true, true),
};

private static final IntegrationConfigOptions[] INTEGRATION_CONFIG_OPTIONS = new IntegrationConfigOptions[]{
new IntegrationConfigOptions("Ender IO", EnderIO.PLUGIN_MODID, true),
new IntegrationConfigOptions("IC2", IC2.PLUGIN_MODID, true),
new IntegrationConfigOptions("Mekanism", Mekanism.PLUGIN_MODID, true),
new IntegrationConfigOptions("Thaumcraft", Thaumcraft.PLUGIN_MODID, true),
new IntegrationConfigOptions("Tinkers Construct", TinkersConstruct.PLUGIN_MODID, true),
new IntegrationConfigOptions("Constructs Armory", ConstructsArmory.PLUGIN_MODID, true),
new IntegrationConfigOptions("VeinMiner", VeinMiner.PLUGIN_MODID, true),
new IntegrationConfigOptions("TAIGA", "taiga", true),
new IntegrationConfigOptions("Dense Ores", DenseOres.PLUGIN_MODID, true),
new IntegrationConfigOptions("Thermal Expansion", ThermalExpansion.PLUGIN_MODID, true)
};

/**
* Fired when the configuration changes.
*
Expand All @@ -89,25 +69,9 @@ public static void init() {
}

// GENERAL
Options.setRequireMMDOreSpawn(configuration.getBoolean("using_orespawn", GENERAL_CAT, true,
"If false, then Base Metals will not require MMD Ore Spawn mod. \n"
+ "Set to false if using another mod to manually handle ore generation."));
Options.setEnableAchievements(configuration.getBoolean("achievements", GENERAL_CAT, true,
"If false, then Base Metals Achievements will be disabled (This is currently required if you disable any metals"));
Options.thingEnabled(ConfigKeys.VILLAGER_TRADES, configuration.getBoolean("Enable Villager Trades",
GENERAL_CAT, true, "No, not the Village People, trades with Villagers.\n" +
"Basically... if you don't want BaseMetals (or other *Metals items and blocks) registered as trades with various villagers, set this to false"));
// fallback orespawn can live as a 'thingEnabled' for a bit...
Options.setFallbackOreSpawn(configuration.getBoolean("fallback_orespawn", GENERAL_CAT, true,
"disable this and using_orespawn to make MMDLib based mods not spawn any ores"));
Options.thingEnabled(ConfigKeys.IC2ITEMS_WITHOUT_PLUGIN,
configuration.getBoolean("Enable IC2 Items", GENERAL_CAT, false,
"Enable the items for IC2 support even if the IC2 plugin is disabled"));
Options.thingEnabled(ConfigKeys.MEKITEMS_WITHOUT_PLUGIN,
configuration.getBoolean("Enable Mekanism Items", GENERAL_CAT, false,
"Enable the items for Mekanism support even if the Mekanism plugin is disabled"));

configIntegrationOptions(INTEGRATION_CONFIG_OPTIONS, configuration);

configMaterialOptions(MATERIAL_CONFIG_OPTIONS, configuration);
if (configuration.hasChanged()) {
configuration.save();
Expand Down