From cbcc470a63c0d75d10806405aefc4da7e2754746 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sun, 8 Jul 2018 18:57:30 -0400 Subject: [PATCH 1/2] configure litemod before the task is run. This makes it not generate a build.number until it is built. --- build.gradle | 32 ++++++++++++++++++-------------- build.number | 4 ++-- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index d234d2c6..3ae4d32f 100644 --- a/build.gradle +++ b/build.gradle @@ -44,21 +44,25 @@ sourceSets { } } -litemod.json { - mcversion = '1.12.r2' - author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' - description = 'Mine Little Pony turns players and mobs into ponies' - description.minelittlepony = '''\ - Mine Little Pony turns players and mobs into ponies - Press F9 ingame to access settings'''.stripIndent() - description.hdskinsmod = '''\ - Separate skin server for Mine Little Pony that also supports HD skins. - Access via button on the main menu.'''.stripIndent() +litemod { + doFirst { + json { + mcversion = '1.12.r2' + author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' + description = 'Mine Little Pony turns players and mobs into ponies' + description.minelittlepony = '''\ + Mine Little Pony turns players and mobs into ponies + Press F9 ingame to access settings''' + description.hdskinsmod = '''\ + Separate skin server for Mine Little Pony that also supports HD skins. + Access via button on the main menu.''' - mixinConfigs += [ - 'minelp.mixin.json', - 'hdskins.mixin.json' - ] + mixinConfigs += [ + 'minelp.mixin.json', + 'hdskins.mixin.json' + ] + } + } } jar { diff --git a/build.number b/build.number index fd955a7b..83e6cc8d 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Jun 11 22:03:32 CAT 2018 -build.number=499 +#Sun Jul 08 18:54:44 EDT 2018 +build.number=500 From e02eac5fabae26e3fe14f4761448dafce9ba6bf0 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sun, 8 Jul 2018 18:58:20 -0400 Subject: [PATCH 2/2] build.gradle tabs -> spaces --- build.gradle | 116 +++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/build.gradle b/build.gradle index 3ae4d32f..9705d86c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,19 @@ buildscript { - repositories { - jcenter() - maven { - name 'forge' - url 'http://files.minecraftforge.net/maven' - } - maven { - name = 'sponge' - url = 'https://repo.spongepowered.org/maven' - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' - } + repositories { + jcenter() + maven { + name 'forge' + url 'http://files.minecraftforge.net/maven' + } + maven { + name = 'sponge' + url = 'https://repo.spongepowered.org/maven' + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' + } } apply plugin: 'net.minecraftforge.gradle.liteloader' @@ -27,76 +27,76 @@ targetCompatibility = 1.8 sourceCompatibility = 1.8 minecraft { - version = "1.12.2" - mappings = 'snapshot_20170919' - runDir = 'run' - replace '@VERSION@', project.version + version = "1.12.2" + mappings = 'snapshot_20170919' + runDir = 'run' + replace '@VERSION@', project.version } sourceSets { - hdskins { - compileClasspath += main.compileClasspath - ext.refMap = 'hdskins.mixin.refmap.json' - } - main { - compileClasspath += hdskins.output - ext.refMap = 'minelp.mixin.refmap.json' - } + hdskins { + compileClasspath += main.compileClasspath + ext.refMap = 'hdskins.mixin.refmap.json' + } + main { + compileClasspath += hdskins.output + ext.refMap = 'minelp.mixin.refmap.json' + } } litemod { - doFirst { - json { - mcversion = '1.12.r2' - author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' - description = 'Mine Little Pony turns players and mobs into ponies' - description.minelittlepony = '''\ + doFirst { + json { + mcversion = '1.12.r2' + author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' + description = 'Mine Little Pony turns players and mobs into ponies' + description.minelittlepony = '''\ Mine Little Pony turns players and mobs into ponies Press F9 ingame to access settings''' - description.hdskinsmod = '''\ + description.hdskinsmod = '''\ Separate skin server for Mine Little Pony that also supports HD skins. Access via button on the main menu.''' - mixinConfigs += [ - 'minelp.mixin.json', - 'hdskins.mixin.json' - ] - } - } + mixinConfigs += [ + 'minelp.mixin.json', + 'hdskins.mixin.json' + ] + } + } } jar { - from sourceSets.hdskins.output - from litemod + from sourceSets.hdskins.output + from litemod } sourceJar { - // add hdskins sources - from sourceSets.hdskins.allSource + // add hdskins sources + from sourceSets.hdskins.allSource } task srgJar(type: Jar) { - from sourceSets.main.output - from sourceSets.hdskins.output - from litemod - classifier "mc$minecraft.version-srg" - baseName "mod-${project.name.toLowerCase()}" + from sourceSets.main.output + from sourceSets.hdskins.output + from litemod + classifier "mc$minecraft.version-srg" + baseName "mod-${project.name.toLowerCase()}" } task skinZip(type: Zip) { - from fileTree('skins') - baseName 'Pony Skin Resources' - version 'v1' + from fileTree('skins') + baseName 'Pony Skin Resources' + version 'v1' } reobf { - srgJar { - mappingType = 'SEARGE' - } + srgJar { + mappingType = 'SEARGE' + } } mixin { - defaultObfuscationEnv notch + defaultObfuscationEnv notch } // windows only task deploy(type: Copy, dependsOn: build) { - from jar.archivePath - into file("$System.env.APPDATA/.minecraft/mods") + from jar.archivePath + into file("$System.env.APPDATA/.minecraft/mods") }