From 465806abda227b0baf2fa7a94aa612ce4f0cafc0 Mon Sep 17 00:00:00 2001 From: Daniel Hazelton Date: Wed, 24 Apr 2019 10:09:32 -0400 Subject: [PATCH 1/2] the JEI stuff is in MMDLib, not BaseMetals - moved there --- .../basemetals/textures/jei/jeihammeroverlay.png | Bin 3795 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/basemetals/textures/jei/jeihammeroverlay.png diff --git a/src/main/resources/assets/basemetals/textures/jei/jeihammeroverlay.png b/src/main/resources/assets/basemetals/textures/jei/jeihammeroverlay.png deleted file mode 100644 index 299f42e02fc860d079e1ec3a965ef83b22c92fd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3795 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 From 593990e344eb68053850009445cdb55f06403be7 Mon Sep 17 00:00:00 2001 From: Daniel Hazelton Date: Wed, 24 Apr 2019 12:49:24 -0400 Subject: [PATCH 2/2] move almost all of the bits from the 'general' config category out to MMDLib --- .../mcmoddev/basemetals/util/BMeConfig.java | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/src/main/java/com/mcmoddev/basemetals/util/BMeConfig.java b/src/main/java/com/mcmoddev/basemetals/util/BMeConfig.java index 82b4f299..65b1f404 100644 --- a/src/main/java/com/mcmoddev/basemetals/util/BMeConfig.java +++ b/src/main/java/com/mcmoddev/basemetals/util/BMeConfig.java @@ -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; @@ -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 @@ -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. * @@ -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();