Fix gradle
Fixed gradle so it has an output of all included but its what i want, also fixed version numbers
This commit is contained in:
parent
1eabdaf35b
commit
cbd3558d35
5 changed files with 26 additions and 6 deletions
22
build.gradle
22
build.gradle
|
@ -56,7 +56,7 @@ dependencies {
|
||||||
compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.CCC_version}:dev"
|
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"
|
archivesBaseName = "MekanismAll"
|
||||||
libsDirName = "../output"
|
libsDirName = "../output"
|
||||||
distsDirName = "../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) {
|
task toolsJar(type: Jar) {
|
||||||
baseName = 'MekanismTools'
|
baseName = 'MekanismTools'
|
||||||
|
|
||||||
|
@ -123,6 +138,8 @@ task generatorsJar(type: Jar) {
|
||||||
coreJar.dependsOn('reobf')
|
coreJar.dependsOn('reobf')
|
||||||
toolsJar.dependsOn('reobf')
|
toolsJar.dependsOn('reobf')
|
||||||
generatorsJar.dependsOn('reobf')
|
generatorsJar.dependsOn('reobf')
|
||||||
|
alltJar.dependsOn('reobf')
|
||||||
|
|
||||||
|
|
||||||
task MDKZip(type: Zip) {
|
task MDKZip(type: Zip) {
|
||||||
baseName = 'MDK'
|
baseName = 'MDK'
|
||||||
|
@ -135,13 +152,16 @@ task releaseJars(type: Copy) {
|
||||||
from toolsJar
|
from toolsJar
|
||||||
from generatorsJar
|
from generatorsJar
|
||||||
from MDKZip
|
from MDKZip
|
||||||
|
from alltJar
|
||||||
rename '-(.*)jar', '.jar'
|
rename '-(.*)jar', '.jar'
|
||||||
rename '-(.*)zip', '.zip'
|
rename '-(.*)zip', '.zip'
|
||||||
into '.'
|
into '.'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
task fullBuild(type: Delete) {
|
task fullBuild(type: Delete) {
|
||||||
delete jar
|
delete jar
|
||||||
}
|
}
|
||||||
|
|
||||||
fullBuild.dependsOn('releaseJars')
|
fullBuild.dependsOn('releaseJars')
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,4 @@ FMP_version=1.2.0.345
|
||||||
CCLIB_version=1.1.3.136
|
CCLIB_version=1.1.3.136
|
||||||
NEI_version=1.0.4.101
|
NEI_version=1.0.4.101
|
||||||
CCC_version=1.0.6.39
|
CCC_version=1.0.6.39
|
||||||
mod_version=9.10.3
|
mod_version=9.10.4
|
||||||
|
|
|
@ -142,7 +142,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
* @author AidanBrady
|
* @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;" +
|
dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
|
||||||
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
|
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
|
||||||
public class Mekanism
|
public class Mekanism
|
||||||
|
@ -168,7 +168,7 @@ public class Mekanism
|
||||||
public static Configuration configuration;
|
public static Configuration configuration;
|
||||||
|
|
||||||
/** Mekanism version number */
|
/** 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 */
|
/** MultiblockManagers for various structrures */
|
||||||
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
|
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
|
||||||
|
|
|
@ -44,7 +44,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
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
|
public class MekanismGenerators implements IModule
|
||||||
{
|
{
|
||||||
@SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy")
|
@SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy")
|
||||||
|
|
|
@ -29,7 +29,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
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
|
public class MekanismTools implements IModule
|
||||||
{
|
{
|
||||||
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
|
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
|
||||||
|
|
Loading…
Reference in a new issue