diff --git a/botany/src/main/resources/mcmod.info b/botany/src/main/resources/mcmod.info deleted file mode 100644 index 863d8ff4..00000000 --- a/botany/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "modid": "botany", - "name": "Binnie's Botany", - "description": "Adds breedable flowers.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "https://minecraft.curseforge.com/projects/binnies-mods", - "updateUrl": "", - "authorList": [ "Binnie" ], - "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", - "logoFile": "/assets/botany/logo.png", - "parent": "", - "dependencies": [ "binniecore" ] - } -] diff --git a/core/src/main/java/binnie/core/modules/ModuleContainer.java b/core/src/main/java/binnie/core/modules/ModuleContainer.java index c10f0a84..72a0e8da 100644 --- a/core/src/main/java/binnie/core/modules/ModuleContainer.java +++ b/core/src/main/java/binnie/core/modules/ModuleContainer.java @@ -33,7 +33,7 @@ public class ModuleContainer implements IModuleContainer { unloadedModules = new LinkedHashSet<>(); enabledModules = new LinkedHashSet<>(); configFolder = new File(Loader.instance().getConfigDir(), Constants.FORESTRY_CONFIG_FOLDER + modId); - configModules = new Configuration(configFolder, "modules.cfg"); + configModules = new Configuration(new File(configFolder, "modules.cfg")); configHandlers = new HashSet<>(); } diff --git a/core/src/main/resources/mcmod.info b/core/src/main/resources/mcmod.info index 0a3a09f7..a1feb8b2 100644 --- a/core/src/main/resources/mcmod.info +++ b/core/src/main/resources/mcmod.info @@ -13,5 +13,61 @@ "parent": "", "requiredMods": [ "forestry" ], "dependencies": [ "forestry" ] + }, + { + "modid": "extrabees", + "name": "Binnie's Extra Bees", + "description": "Adds new bees and products to expand the bee breeding in Forestry.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", + "updateUrl": "", + "authorList": [ "Binnie" ], + "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", + "logoFile": "/assets/extrabees/logo.png", + "parent": "", + "dependencies": [ "BinnieCore" ] + }, + { + "modid": "extratrees", + "name": "Binnie's Extra Trees", + "description": "Adds new trees, aesthetic blocks and alcohol production.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", + "updateUrl": "", + "authorList": [ "Binnie" ], + "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", + "logoFile": "/assets/extratrees/logo.png", + "parent": "", + "dependencies": [ "BinnieCore" ] + }, + { + "modid": "botany", + "name": "Binnie's Botany", + "description": "Adds breedable flowers.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", + "updateUrl": "", + "authorList": [ "Binnie" ], + "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", + "logoFile": "/assets/botany/logo.png", + "parent": "", + "dependencies": [ "BinnieCore" ] + }, + { + "modid": "genetics", + "name": "Binnie's Genetics", + "description": "Adds genetic manipulation for bees, trees, butterflies and flowers.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", + "updateUrl": "", + "authorList": [ "Binnie" ], + "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", + "logoFile": "/assets/genetics/logo.png", + "parent": "", + "dependencies": [ "BinnieCore" ] } ] diff --git a/extrabees/src/main/resources/mcmod.info b/extrabees/src/main/resources/mcmod.info deleted file mode 100644 index 6e95fde4..00000000 --- a/extrabees/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "modid": "extrabees", - "name": "Binnie's Extra Bees", - "description": "Adds new bees and products to expand the bee breeding in Forestry.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "https://minecraft.curseforge.com/projects/binnies-mods", - "updateUrl": "", - "authorList": [ "Binnie" ], - "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", - "logoFile": "/assets/extrabees/logo.png", - "parent": "", - "dependencies": [ "binniecore" ] - } -] diff --git a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java index 4b3d20fc..3c8418b7 100644 --- a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,9 +1,5 @@ package binnie.extratrees; -import binnie.core.Binnie; -import binnie.core.api.genetics.IBreedingSystem; -import binnie.extratrees.genetics.MothBreedingSystem; -import binnie.extratrees.genetics.TreeBreedingSystem; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; @@ -12,16 +8,20 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import binnie.core.Constants; +import binnie.core.Binnie; import binnie.core.BinnieCore; +import binnie.core.Constants; +import binnie.core.api.genetics.IBreedingSystem; import binnie.core.gui.IBinnieGUID; +import binnie.core.modules.BlankModuleContainer; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extratrees.block.ModuleBlocks; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.core.ExtraTreesGUID; +import binnie.extratrees.genetics.MothBreedingSystem; +import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.extratrees.proxy.Proxy; -import binnie.core.modules.BlankModuleContainer; @Mod( modid = Constants.EXTRA_TREES_MOD_ID, @@ -47,6 +47,7 @@ public class ExtraTrees extends BlankModuleContainer { @Mod.EventHandler public void preInit(final FMLPreInitializationEvent evt) { + container.registerConfigHandler(new ConfigurationMain(container)); super.preInit(evt); treeBreedingSystem = new TreeBreedingSystem(); mothBreedingSystem = new MothBreedingSystem(); diff --git a/extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java index c8ad45e8..42d7b6e0 100644 --- a/extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ b/extratrees/src/main/java/binnie/extratrees/config/ConfigurationMain.java @@ -1,12 +1,27 @@ package binnie.extratrees.config; -import binnie.core.config.ConfigFile; -import binnie.core.config.ConfigProperty; -import binnie.core.config.PropBoolean; +import java.io.File; -@ConfigFile(filename = "/config/forestry/extratrees/main.conf") -public class ConfigurationMain { - @ConfigProperty(key = "lemon.citrus.family", comment = {"Uses reflection to convert the Forestry lemon tree to the Citrus family."}) - @PropBoolean +import net.minecraftforge.common.config.Configuration; + +import binnie.core.modules.IConfigHandler; +import binnie.core.modules.IModuleContainer; + +public class ConfigurationMain implements IConfigHandler { public static boolean alterLemon = true; + + private final Configuration config; + + public ConfigurationMain(IModuleContainer container) { + this.config = new Configuration(new File(container.getConfigFolder(), "main.cfg")); + } + + @Override + public void loadConfig() { + //TODO: Localise comment + alterLemon = config.getBoolean("family", "lemon.citrus", alterLemon, "Uses reflection to convert the Forestry lemon tree to the Citrus family."); + if(config.hasChanged()){ + config.save(); + } + } } diff --git a/extratrees/src/main/resources/mcmod.info b/extratrees/src/main/resources/mcmod.info deleted file mode 100644 index ee5d2632..00000000 --- a/extratrees/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "modid": "extratrees", - "name": "Binnie's Extra Trees", - "description": "Adds new trees, aesthetic blocks and alcohol production.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "https://minecraft.curseforge.com/projects/binnies-mods", - "updateUrl": "", - "authorList": [ "Binnie" ], - "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", - "logoFile": "/assets/extratrees/logo.png", - "parent": "", - "dependencies": [ "binniecore" ] - } -] diff --git a/genetics/src/main/resources/mcmod.info b/genetics/src/main/resources/mcmod.info deleted file mode 100644 index 1eb28c44..00000000 --- a/genetics/src/main/resources/mcmod.info +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "modid": "genetics", - "name": "Binnie's Genetics", - "description": "Adds genetic manipulation for bees, trees, butterflies and flowers.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "https://minecraft.curseforge.com/projects/binnies-mods", - "updateUrl": "", - "authorList": [ "Binnie" ], - "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", - "logoFile": "/assets/genetics/logo.png", - "parent": "", - "dependencies": [ "binniecore" ] - } -]