From 20fea3f49d3e8d6cef93bbaa1f9db6da4e82d79e Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 11 Oct 2018 18:54:05 -0700 Subject: [PATCH] MDK progress. --- .gitignore | 2 ++ build.gradle | 14 +++++++++++--- mdk/build.gradle | 45 ++++++++++++++++++++++++++++++--------------- mdk/test_at.cfg | 1 + 4 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 mdk/test_at.cfg diff --git a/.gitignore b/.gitignore index 28d7cecda..3ad106c0b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ #gradle /build /.gradle +/mdk/.gradle +/mdk/build #occupational hazards /projects/ diff --git a/build.gradle b/build.gradle index e069476c2..f129677a0 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,6 @@ project(':forge') { accessTransformer = file("$rootDir/src/main/resources/forge_at.cfg") exc = file("$rootDir/src/main/resources/forge.exc") srgPatches = true - srgUniversal = true clientRun { main = 'net.minecraftforge.fml.LaunchTesting' environment = [ @@ -621,7 +620,8 @@ project(':forge') { universalJar.finalizedBy(signUniversal) task downloadInstaller(type: DownloadMavenArtifact) { - artifact = 'net.minecraftforge:installer:2.+:shrunk' + artifact = 'net.minecraftforge:installer:2.0.+:shrunk' + changing = true } task installerJar(type: Zip, dependsOn: [downloadInstaller, signUniversal, installerJson, launcherJson, genClientBinPatches, genServerBinPatches]) { @@ -690,6 +690,13 @@ project(':forge') { } } + userdevConfig { + def artifacts = getArtifacts(project, project.configurations.installer, true) + artifacts.each { key, lib -> + addLibrary(lib.name) + } + } + license { header = file("$rootDir/LICENSE-header.txt") @@ -709,7 +716,7 @@ project(':forge') { files = files("$rootDir/src/test/java") } } - } + } publishing { publications { @@ -720,6 +727,7 @@ project(':forge') { //TODO: installer-win artifact makeMdk artifact userdevJar + artifact sourcesJar pom { name = 'forge' diff --git a/mdk/build.gradle b/mdk/build.gradle index 6dead0b5b..1b9f242b0 100644 --- a/mdk/build.gradle +++ b/mdk/build.gradle @@ -1,19 +1,31 @@ buildscript { repositories { + mavenLocal() + maven { url = 'http://files.minecraftforge.net/maven' } jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + mavenCentral() + } + // This is only here while i'm activly developing FG, Remind me to remove when we publically release + configurations { + classpath.resolutionStrategy { + cacheDynamicVersionsFor 10, 'seconds' + cacheChangingModulesFor 0, 'seconds' + } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true } } -apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'net.minecraftforge.gradle' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +repositories { + maven { url ='file://' + file('../repo').absolutePath } //Used by Forge development testing only, you can delete this. +} -version = "1.0" -group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "modid" +version = '1.0' +group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'modid' sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. compileJava { @@ -21,24 +33,27 @@ compileJava { } minecraft { - version = "@VERSION@" - runDir = "run" - // the mappings can be changed at any time, and must be in the following format. // snapshot_YYYYMMDD snapshot are built nightly. // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "@MAPPINGS@" + mappings channel: 'snapshot', version: '20180921-1.13' // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + + accessTransformer = file('test_at.cfg') } dependencies { + // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + minecraft 'net.minecraftforge:forge:1.13-15.24.0.0-1.13-pre' + // you may put jars on which you depend on in ./libs // or you may define them like so.. //compile "some.group:artifact:version:classifier" //compile "some.group:artifact:version" - + // real examples //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env @@ -59,17 +74,17 @@ dependencies { processResources { // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + inputs.property 'version', project.version + inputs.property 'mcversion', '1.13' // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version + expand 'version':project.version, 'mcversion': '1.13' } - + // copy everything else except the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' diff --git a/mdk/test_at.cfg b/mdk/test_at.cfg new file mode 100644 index 000000000..fe3639d12 --- /dev/null +++ b/mdk/test_at.cfg @@ -0,0 +1 @@ +public net.minecraft.block.Block field_196273_d # LOGGER \ No newline at end of file