Merge pull request #395 from FlansMods/Development

Merge 4.2.3 1.7.2 update into master

.gitignore

@@ -1,37 +1,9 @@
-.DS_Store
-.metadata
-CHANGELOG
-LICENSE.txt
-Thumbs.db
-
-/build/*
-
-/bin/*
-/conf/*
-/docs/*
-/eclipse/*
-/forge/*
-/jars/*
-/lib/*
-/logs/*
-/modsrc/*
-/reobf/*
-/runtime/*
-/temp/*
-
-/src/common/*
-/src/minecraft/*
-/src/minecraft_server/*
-
-!/src/minecraft/assets/flansmod/
-!/src/minecraft/co/
-!/src/minecraft/icbm/
-!/src/minecraft/universalelectricity/
-!/src/minecraft/mcmod.info
-!/src/minecraft/flansmod.png
-!/src/minecraft/pack.mcmeta
-!/jars/Flan/
-!/LICENSE.txt
-
-*.bat
-*.sh
+build/
+.classpath
+.project
+.gradle/
+.settings/
+eclipse/
+bin/
+
+!eclipse/Flan/

README.md

@@ -1,11 +1,11 @@
-# Flan's Mod for Minecraft #
-
-Here you will find the source code from the Minecraft modification, Flan's Mod.  If you want to pitch in,
-just submit a pull request, and either _aidancbrady_, _godgodgodgo_ or _jamioflan_ will review and merge.  If you are here
-because of a crash or bug, you can simply submit it in the 'Issues' section.  Be sure to double-check that
-the bug wasn't reported previously or caused by other modifications.
-
-Please make any pull requests to the development branch.
-
-This GitHub environment is to be treated maturely -- do not release any of this source code without prior
-permission from jamioflan.
+# Flan's Mod for Minecraft #
+
+Here you will find the source code from the Minecraft modification, Flan's Mod.  If you want to pitch in,
+just submit a pull request, and either _aidancbrady_, _godgodgodgo_ or _jamioflan_ will review and merge.  If you are here
+because of a crash or bug, you can simply submit it in the 'Issues' section.  Be sure to double-check that
+the bug wasn't reported previously or caused by other modifications.
+
+Please make any pull requests to the development branch.
+
+This GitHub environment is to be treated maturely -- do not release any of this source code without prior
+permission from jamioflan.

build.gradle

@@ -0,0 +1,128 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+
+version = "4.2.3"
+group= "com.flansmod"
+archivesBaseName = "Flan's Mod"
+
+minecraft {
+    version = "1.7.2-10.12.1.1060"
+    assetDir = "eclipse/assets"
+
+    replace "@ALLOWED_VERSION@", "[4.2,)"
+    replace "@MC_VERSION@", project.minecraft.version
+    replace "@VERSION@", project.version
+    replaceIn "FlansMod.java"
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // 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
+    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+version = "${project.minecraft.version}-${project.version}"
+
+task modernWeapons(type: Jar) {
+    baseName = 'Modern Warfare'
+    appendix = 'Content Pack'
+    from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/mw/'}
+    from 'eclipse/Flan/Modern Weapons Pack'
+}
+
+task nerf(type: Jar) {
+    baseName = 'Nerf'
+    appendix = 'Content Pack'
+    from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/nerf/'}
+    from 'eclipse/Flan/Nerf Pack'
+}
+
+task simpleParts(type: Jar) {
+    baseName = 'Simple Parts'
+    appendix = 'Content Pack'
+    from 'eclipse/Flan/Parts Pack'
+}
+
+task titan(type: Jar) {
+    baseName = 'Titan'
+    appendix = 'Content Pack'
+    from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/titan/'}
+    from 'eclipse/Flan/Titan Pack'
+}
+
+task ww2(type: Jar) {
+    baseName = 'WW2'
+    appendix = 'Content Pack'
+    from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/ww2/'}
+    from 'eclipse/Flan/WW2 Pack'
+}
+
+task yeOlde(type: Jar) {
+    baseName = 'Ye Olde'
+    appendix = 'Content Pack'
+    from (zipTree("${destinationDir}/${archiveName}")) { include 'com/flansmod/client/model/yeolde/'}
+    from 'eclipse/Flan/Ye Olde Pack'
+}
+
+task contentPacks() {
+    dependsOn modernWeapons
+    dependsOn nerf
+    dependsOn simpleParts
+    dependsOn titan
+    dependsOn ww2
+    dependsOn yeOlde
+}
+
+task outputJar(type: Jar) {
+    destinationDir = new File("build/output/mods/")
+    from (zipTree("build/libs/${archiveName}")) {
+        exclude '**/mw/'
+        exclude '**/nerf/'
+        exclude '**/titan/'
+        exclude '**/ww2/'
+        exclude '**/yeolde/'
+    }
+}
+
+task outputPacks(type: Copy) {
+    from ('build/libs/') {
+        exclude "**/Flan's Mod*.jar"
+    }
+    into 'build/output/Flan/'
+}
+
+build {
+    dependsOn contentPacks
+    dependsOn outputJar
+    dependsOn outputPacks
+}