diff --git a/build.gradle b/build.gradle index 6f18adb4..5d512cfa 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,9 @@ minecraft { version = mcversion + "-" + forgeversion mappings = mcp_mappings runDir = "run" + + replace '@VERSION@', project.version + replace '@BUILD_NUMBER@', getBuildNumber() } repositories { diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 1783ac12..51068314 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -60,7 +60,11 @@ import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; -@Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@Mod( + modid = Constants.BOTANY_MOD_ID, + name = "Binnie's Botany", + dependencies = "required-after:" + Constants.CORE_MOD_ID +) public class Botany extends AbstractMod { public static final float AGE_CHANCE = 0.2f; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index edfc82ec..d9858445 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -55,7 +55,7 @@ import binnie.core.triggers.ModuleTrigger; @Mod( modid = Constants.CORE_MOD_ID, name = "Binnie Core", - useMetadata = true, + version = "@VERSION@", dependencies = "required-after:forge@[13.20.0.2279,);" + "required-after:forestry@[5.3.4.102,);" + "after:jei@[4.3.1,);" diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 1121a94d..70f1c39d 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -51,7 +51,11 @@ import binnie.extrabees.utils.config.ConfigHandler; import binnie.extrabees.utils.config.ConfigurationMain; import binnie.extrabees.worldgen.ExtraBeesWorldGenerator; -@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@Mod( + modid = ExtraBees.MODID, + name = "Binnie's Extra Bees", + dependencies = "required-after:" + Constants.CORE_MOD_ID +) public class ExtraBees { public static final String MODID = "extrabees"; diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index e227ec12..65b86c0b 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -49,7 +49,11 @@ import binnie.extratrees.kitchen.ModuleKitchen; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.proxy.Proxy; -@Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) +@Mod( + modid = Constants.EXTRA_TREES_MOD_ID, + name = "Binnie's Extra Trees", + dependencies = "required-after:" + Constants.CORE_MOD_ID +) public class ExtraTrees extends AbstractMod { @SuppressWarnings("NullableProblems") diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 58ffc707..d7a86acd 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -37,7 +37,6 @@ import binnie.genetics.proxy.Proxy; @Mod( modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", - useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID ) public class Genetics extends AbstractMod { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index b98ed776..78f40d0d 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,11 +1,11 @@ [ { - "modid": "BinnieCore", + "modid": "binniecore", "name": "Binnie Core", "description": "Base mod for Binnie's Mods, with lots of common code.", - "version": "2.0-pre14", - "mcversion": "1.7.10", - "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", @@ -13,16 +13,14 @@ "parent": "", "requiredMods": [ "forestry" ], "dependencies": [ "forestry" ], - "dependants" : [ ], - "useDependencyInformation" : true }, { - "modid": "ExtraBees", + "modid": "extrabees", "name": "Binnie's Extra Bees", "description": "Adds new bees and products to expand the bee breeding in Forestry.", - "version": "2.0-pre14", - "mcversion": "1.7.10", - "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", @@ -31,12 +29,12 @@ "dependencies": [ "BinnieCore" ] }, { - "modid": "ExtraTrees", + "modid": "extratrees", "name": "Binnie's Extra Trees", "description": "Adds new trees, aesthetic blocks and alcohol production.", - "version": "2.0-pre14", - "mcversion": "1.7.10", - "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", @@ -45,12 +43,12 @@ "dependencies": [ "BinnieCore" ] }, { - "modid": "Botany", + "modid": "botany", "name": "Binnie's Botany", "description": "Adds breedable flowers.", - "version": "2.0-pre14", - "mcversion": "1.7.10", - "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others", @@ -59,12 +57,12 @@ "dependencies": [ "BinnieCore" ] }, { - "modid": "Genetics", + "modid": "genetics", "name": "Binnie's Genetics", "description": "Adds genetic manipulation for bees, trees, butterflies and flowers.", - "version": "2.0-pre14", - "mcversion": "1.7.10", - "url": "http://minecraft.curseforge.com/mc-mods/223525-binnies-mods", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://minecraft.curseforge.com/projects/binnies-mods", "updateUrl": "", "authorList": [ "Binnie" ], "credits": "Thanks to Sengir, MysteriousAges, Xizzzy and many others",