Merge branch '1.8.9'

Conflicts: build.properties gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties src/api/java/modwarriors/notenoughkeys/api/KeyBindingPressedEvent.java src/api/java/modwarriors/notenoughkeys/api/package-info.java src/main/java/mapwriter/forge/MwKeyHandler.java src/main/java/mapwriter/gui/MwGui.java src/main/java/mapwriter/gui/MwGuiDimensionDialog.java src/main/java/mapwriter/gui/MwGuiMarkerDialog.java src/main/java/mapwriter/gui/MwGuiMarkerDialogNew.java src/main/java/mapwriter/gui/MwGuiOptionSlot.java src/main/java/mapwriter/gui/MwGuiOptions.java src/main/java/mapwriter/gui/MwGuiTeleportDialog.java src/main/java/mapwriter/region/MwChunk.java src/main/resources/assets/mapwriter/lang/en_US.lang src/main/resources/assets/mapwriter/lang/zh_CN.lang
Vectron · Jan 28, 2016 · 432e20f · 432e20f
2 parents 4f98031 + f8942c1
commit 432e20f
Show file tree

Hide file tree

Showing 90 changed files with 12,182 additions and 8,209 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,21 +1,25 @@
-.gradle
-build
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
 out
-classes
-*.iml
 *.ipr
 *.iws
-runtime
-.classpath
-.project
-.settings
-bin
-Build.bat
-Clean.bat
-Deploy.bat
-FixDependicies.bat
-Install Forge.bat
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
 eclipse
+run
 /Run.bat
 /mapwriter_Client.launch
 /mapwriter_Server.launch
diff --git a/build.gradle b/build.gradle
@@ -1,125 +1,135 @@
-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'
-apply plugin: 'curseforge'
-
-repositories {
-	mavenLocal()
-} 
-
-// Define properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-// Load config. It shall from now be referenced as simply config or project.config
-def prop = new Properties()
-prop.load(it)
-project.ext.config = new ConfigSlurper().parse prop
-}
-
-dependencies {
-	if (config.isSet('dependicies'))	{
-		def dep = config.dependicies.split(", ")
-		dep.each { compile it }
-	}
-}
-
-group= config.mod_group
-version = config.mod_version
-archivesBaseName = config.mod_name
-
-
-minecraft {
-version = config.mc_version + "-" + config.forge_version
-runDir = "eclipse"
-mappings = config.mcp_version
-replace '@MOD_VERSION@', config.mod_version
-}
-
-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}"
-
-jar {
-//classifier = 'universal'
-}
-
-task sourceJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'src'
-}
-
-task devJar(type: Jar) {
-from sourceSets.main.output
-classifier = 'dev'
-}
-
-artifacts {
-    		archives sourceJar
-			archives devJar
-}
-
-eclipse {
-    // replace absolute paths with classpath variable GRADLE_CACHE
-    pathVariables 'GRADLE_CACHE': gradle.gradleUserHomeDir
-}
-
-eclipse.classpath.file.whenMerged { classpath ->
-  classpath.entries.each { entry ->
-    if (entry.kind == 'lib') {
-      // for jar files referenced in project folder, use relative path
-      def prefix = projectDir.absolutePath.replace('\\', '/')
-      entry.path = entry.path.replace(prefix, "/$eclipse.project.name")
-    }
-  }
-}
-
-gradle.taskGraph.whenReady { taskGraph ->
-  if (!taskGraph.allTasks.findAll{ it.name == 'eclipseClasspath' }.empty) {
-    gradle.buildFinished {
-      println '----------------------------------------------------------------------'
-      print   "Please set the Eclipse classpath variable 'GRADLE_USER_HOME' in Preferences "
-      println "-> Java -> Build path -> Classpath Variable to $gradle.gradleUserHomeDir"
-      println '----------------------------------------------------------------------'
-    }
-  }
-}
-
-curse {
-    projectId = config.curse_project_id
-    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
-    releaseType = 'release'
-}
+
+// For those who want the bleeding edge
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+		maven { 
+			url = 'https://oss.sonatype.org/content/groups/public' 
+		}
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+		//classpath 'com.matthewprenger:CurseGradle:1.0.5-SNAPSHOT'
+    }
+}
+
+// for people who want stable
+plugins {
+    //id "net.minecraftforge.gradle.forge" version "2.0.2"
+	id 'com.matthewprenger.cursegradle' version '1.0.4'
+}
+
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'com.matthewprenger.cursegradle'
+
+repositories {
+	mavenLocal()
+} 
+
+// Define properties file
+ext.configFile = file "build.properties"
+
+configFile.withReader {
+// Load config. It shall from now be referenced as simply config or project.config
+def prop = new Properties()
+prop.load(it)
+project.ext.config = new ConfigSlurper().parse prop
+}
+
+dependencies {
+	if (config.isSet('dependicies'))	{
+		def dep = config.dependicies.split(", ")
+		dep.each { compile it }
+	}
+}
+
+group= config.mod_group
+version = config.mod_version
+archivesBaseName = config.mod_name
+
+
+minecraft {
+version = config.mc_version + "-" + config.forge_version
+runDir = "eclipse"
+mappings = config.mcp_version
+replace '@MOD_VERSION@', config.mod_version
+replace '@ACCEPTED_MC_VERSION@', config.accepted_mc_version
+}
+
+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}"
+
+jar {
+//classifier = 'universal'
+}
+
+task devJar(type: Jar) {
+	from sourceSets.main.output
+	classifier = 'dev'
+}
+
+artifacts {
+    		archives sourceJar
+			archives devJar
+}
+
+eclipse {
+    // replace absolute paths with classpath variable GRADLE_CACHE
+    pathVariables 'GRADLE_CACHE': gradle.gradleUserHomeDir
+}
+
+eclipse.classpath.file.whenMerged { classpath ->
+  classpath.entries.each { entry ->
+    if (entry.kind == 'lib') {
+      // for jar files referenced in project folder, use relative path
+      def prefix = projectDir.absolutePath.replace('\\', '/')
+      entry.path = entry.path.replace(prefix, "/$eclipse.project.name")
+    }
+  }
+}
+
+gradle.taskGraph.whenReady { taskGraph ->
+  if (!taskGraph.allTasks.findAll{ it.name == 'eclipseClasspath' }.empty) {
+    gradle.buildFinished {
+      println '----------------------------------------------------------------------'
+      print   "Please set the Eclipse classpath variable 'GRADLE_USER_HOME' in Preferences "
+      println "-> Java -> Build path -> Classpath Variable to $gradle.gradleUserHomeDir"
+      println '----------------------------------------------------------------------'
+    }
+  }
+}
+
+curseforge {
+  apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
+  project {
+	//changelogType = "text"
+    id = config.curse_project_id
+    changelog = "" // A file can also be set using: changelog = file('changelog.txt')
+    releaseType = config.release_type
+	mainArtifact jar
+	addGameVersion config.mc_version
+  }
+}
diff --git a/build.properties b/build.properties
@@ -1,7 +1,9 @@
 mod_name=MapWriter
 mod_group=vectron
-mc_version=1.7.10
-forge_version=10.13.4.1448-1.7.10
-mcp_version=stable_nodoc_12
-mod_version=2.1.10
-curse_project_id=231387
+mc_version=1.8.9
+forge_version=11.15.1.1722
+mcp_version=snapshot_20160118
+mod_version=2.3.13
+curse_project_id=231387
+release_type=release
+accepted_mc_version=[1.8.9]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Mon Dec 07 11:14:05 CST 2015
+#Mon Sep 14 12:28:28 PDT 2015
+>>>>>>> refs/heads/1.8.9
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip