From cbd3558d359897d13ee5535a02f89a502a182cf0 Mon Sep 17 00:00:00 2001 From: maggi373 <40539743+maggi373@users.noreply.github.com> Date: Sun, 4 Oct 2020 00:50:11 +0200 Subject: [PATCH] Fix gradle Fixed gradle so it has an output of all included but its what i want, also fixed version numbers --- build.gradle | 22 ++++++++++++++++++- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 ++-- .../generators/common/MekanismGenerators.java | 2 +- .../mekanism/tools/common/MekanismTools.java | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index aec58c5ff91..31d7110f246 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ dependencies { compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.CCC_version}:dev" } -version = "${config.minecraft_version}-${config.mod_version}." + (System.env.BUILD_NUMBER ?: "homebaked") +version = "${config.minecraft_version}-${config.mod_version}." + (System.env.BUILD_NUMBER ?: "terralization") archivesBaseName = "MekanismAll" libsDirName = "../output" distsDirName = "../output" @@ -94,6 +94,21 @@ task coreJar(type: Jar) { } } +task alltJar(type: Jar) { + baseName = 'MekanismALLT' + manifest { + attributes 'FMLCorePlugin': 'mekanism.common.asm.LoadingHook' + attributes 'FMLCorePluginContainsFMLMod': 'true' + } + from('etc/core') { + include '*.info' + expand 'version': config.mod_version, 'mc_version': config.minecraft_version, 'fmp_version': config.FMP_version + } + from zipTree(jar.outputs.getFiles().getSingleFile()).matching { + exclude 'mcmod.info' + } +} + task toolsJar(type: Jar) { baseName = 'MekanismTools' @@ -123,6 +138,8 @@ task generatorsJar(type: Jar) { coreJar.dependsOn('reobf') toolsJar.dependsOn('reobf') generatorsJar.dependsOn('reobf') +alltJar.dependsOn('reobf') + task MDKZip(type: Zip) { baseName = 'MDK' @@ -135,13 +152,16 @@ task releaseJars(type: Copy) { from toolsJar from generatorsJar from MDKZip + from alltJar rename '-(.*)jar', '.jar' rename '-(.*)zip', '.zip' into '.' } + task fullBuild(type: Delete) { delete jar } fullBuild.dependsOn('releaseJars') + diff --git a/build.properties b/build.properties index b636b7f989e..06a4dc7ce75 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.2.0.345 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=9.10.3 +mod_version=9.10.4 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index dfad89fd462..58d1c003b56 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -142,7 +142,7 @@ * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "${version}", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.10.4", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -168,7 +168,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 10, 3); + public static Version versionNumber = new Version(9, 10, 4); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 92b2a05e873..a01da6badce 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -44,7 +44,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.10.3", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.10.4", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index ef5af1451a3..b63c3557660 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -29,7 +29,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.10.3", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.10.4", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")