Merge branch 'dev' into 2017.2

# Conflicts:
#	gradle.properties
#	readme.md
#	src/main/resources/META-INF/plugin.xml

Author: DenWav

gradle.properties

@@ -13,7 +13,7 @@ javaVersion = 1.8
 kotlinVersion = 1.1.1
 
 group = com.demonwav.minecraft-dev
-version = 2017.2-0.7.1
+version = 2017.2-0.7.2
 downloadIdeaSources = true
 
 org.gradle.script.lang.kotlin.accessors.auto=true

readme.md

@@ -10,7 +10,7 @@ Minecraft Development for IntelliJ
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 | **Travis** |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.7.1-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-2017.2--0.7.2-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 Visit [https://minecraftdev.org](https://minecraftdev.org) for information about the project, change logs, features, FAQs, and chat.

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/forge/gradle/tooling/ForgePatcherModelBuilderImpl.groovy

@@ -0,0 +1,55 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2017 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.forge.gradle.tooling
+
+import com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelBuilderImpl
+import org.gradle.api.Project
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+
+final class ForgePatcherModelBuilderImpl implements ModelBuilderService {
+
+    @Override
+    boolean canBuild(String modelName) {
+        return ForgePatcherModel.name == modelName
+    }
+
+    @Override
+    Object buildAll(String modelName, Project project) {
+        def extension = project.extensions.findByName("minecraft")
+        if (extension == null) {
+            // No ForgeGradle
+            return null
+        }
+
+        if (project.plugins.findPlugin("net.minecraftforge.gradle.patcher") == null) {
+            // Not using the patcher plugin
+            return null
+        }
+
+        def mcpModel = new McpModelBuilderImpl().buildAll(modelName, project)
+
+        def set = new HashSet<String>()
+        for (p in extension.projects) {
+            set.add(p.capName)
+        }
+
+        return new ForgePatcherModelImpl(mcpModel, set)
+    }
+
+    @Override
+    ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
+        return ErrorMessageBuilder.create(
+                project, e, "MinecraftDev import errors"
+        ).withDescription("Unable to build MinecraftDev Forge patcher project configuration")
+    }
+}

src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/forge/gradle/tooling/ForgePatcherModelImpl.groovy

@@ -0,0 +1,26 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2017 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.forge.gradle.tooling
+
+import com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModel
+import groovy.transform.CompileStatic
+
+@CompileStatic
+final class ForgePatcherModelImpl implements ForgePatcherModel, Serializable {
+
+    final McpModel mcpModel
+    final Set<String> projects
+
+    ForgePatcherModelImpl(McpModel mcpModel, Set<String> projects) {
+        this.mcpModel = mcpModel
+        this.projects = projects
+    }
+}

src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/forge/gradle/tooling/ForgePatcherModel.java

@@ -0,0 +1,19 @@
+/*
+ * Minecraft Dev for IntelliJ
+ *
+ * https://minecraftdev.org
+ *
+ * Copyright (c) 2017 minecraft-dev
+ *
+ * MIT License
+ */
+
+package com.demonwav.mcdev.platform.forge.gradle.tooling;
+
+import com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModel;
+import java.util.Set;
+
+public interface ForgePatcherModel {
+    McpModel getMcpModel();
+    Set<String> getProjects();
+}

src/gradle-tooling-extension/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService

@@ -1 +1,2 @@
 com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelBuilderImpl
+com.demonwav.mcdev.platform.forge.gradle.tooling.ForgePatcherModelBuilderImpl

src/main/grammars/NbttLexer.flex

@@ -55,7 +55,7 @@ SHORT_LITERAL = [+-]?\d+[sS]
 INT_LITERAL = [+-]?\d+[iI]?
 LONG_LITERAL = [+-]?\d+[lL]
 FLOAT_LITERAL = [+-]?(\d+(\.\d*(E\d+)?)?[fF]|\d*\.\d+(E\d+)?[fF]|Infinity[fF])|NaN[fF]
-DOUBLE_LITERAL = [+-]?(\d*\.\d+(E\d+)?[dD|]?|\d+\.\d*(E\d+)?[dD|]?|\d+(E\d+)?[dD|]|Infinity[dD|]?)|NaN[dD|]?
+DOUBLE_LITERAL = [+-]?(\d*\.\d+(E\d+)?[dD]?|\d+\.\d*(E\d+)?[dD]?|\d+(E\d+)?[dD]|Infinity[dD]?)|NaN[dD]?
 
 STRING_LITERAL = \"([^\"\\\n]|(\\[\"\\nt]))*[\"\n]
 UNQUOTED_STRING_LITERAL = ([^\"\s\n:{}\[\](),\d+\-]|\\[\"\\nt])|([^\"\s\n:{}\[\](),\d+\-]|\\[\"\\nt])([^\"\\:{}\[\](),\n]|\\[\"\\nt])*[^\"\s\n:{}\[\](),]

src/main/kotlin/com/demonwav/mcdev/creator/BuildSystemWizardStep.kt

@@ -13,7 +13,9 @@ package com.demonwav.mcdev.creator
 import com.demonwav.mcdev.buildsystem.BuildSystem
 import com.demonwav.mcdev.buildsystem.gradle.GradleBuildSystem
 import com.demonwav.mcdev.buildsystem.maven.MavenBuildSystem
-import com.demonwav.mcdev.exception.MinecraftSetupException
+import com.demonwav.mcdev.exception.EmptyFieldSetupException
+import com.demonwav.mcdev.exception.OtherSetupException
+import com.demonwav.mcdev.exception.SetupException
 import com.demonwav.mcdev.platform.PlatformType
 import com.demonwav.mcdev.platform.hybrid.SpongeForgeProjectConfiguration
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
@@ -81,29 +83,29 @@ class BuildSystemWizardStep(private val creator: MinecraftProjectCreator) : Modu
     override fun validate(): Boolean {
         try {
             if (groupIdField.text.isEmpty()) {
-                throw MinecraftSetupException("fillAll", groupIdField)
+                throw EmptyFieldSetupException(groupIdField)
             }
 
             if (artifactIdField.text.isEmpty()) {
-                throw MinecraftSetupException("fillAll", artifactIdField)
+                throw EmptyFieldSetupException(artifactIdField)
             }
 
             if (versionField.text.trim { it <= ' ' }.isEmpty()) {
-                throw MinecraftSetupException("fillAll", versionField)
+                throw EmptyFieldSetupException(versionField)
             }
 
             if (!groupIdField.text.matches("\\S+".toRegex())) {
-                throw MinecraftSetupException("The GroupId field cannot contain any whitespace", groupIdField)
+                throw OtherSetupException("The GroupId field cannot contain any whitespace", groupIdField)
             }
 
             if (!artifactIdField.text.matches("\\S+".toRegex())) {
-                throw MinecraftSetupException("The ArtifactId field cannot contain any whitespace", artifactIdField)
+                throw OtherSetupException("The ArtifactId field cannot contain any whitespace", artifactIdField)
             }
 
             if (creator.settings.values.stream().anyMatch { s -> s.type === PlatformType.FORGE } && buildSystemBox.selectedIndex == 0) {
-                throw MinecraftSetupException("Forge does not support Maven", buildSystemBox)
+                throw OtherSetupException("Forge does not support Maven", buildSystemBox)
             }
-        } catch (e: MinecraftSetupException) {
+        } catch (e: SetupException) {
             JBPopupFactory.getInstance().createHtmlTextBalloonBuilder(e.error, MessageType.ERROR, null)
                 .setFadeoutTime(2000)
                 .createBalloon()

src/main/kotlin/com/demonwav/mcdev/creator/ForgeProjectSettingsWizard.form

@@ -81,15 +81,15 @@
                   <text value="Mod Name"/>
                 </properties>
               </component>
-              <component id="c81fa" class="javax.swing.JTextField" binding="pluginNameField">
+              <component id="c81fa" class="javax.swing.JTextField" binding="modNameField">
                 <constraints>
                   <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                     <preferred-size width="150" height="-1"/>
                   </grid>
                 </constraints>
                 <properties/>
               </component>
-              <component id="483ec" class="javax.swing.JTextField" binding="pluginVersionField">
+              <component id="483ec" class="javax.swing.JTextField" binding="modVersionField">
                 <constraints>
                   <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                     <preferred-size width="150" height="-1"/>

src/main/kotlin/com/demonwav/mcdev/creator/ForgeProjectSettingsWizard.kt

@@ -35,8 +35,8 @@ import javax.swing.SwingWorker
 
 class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) : MinecraftModuleWizardStep() {
 
-    private lateinit var pluginNameField: JTextField
-    private lateinit var pluginVersionField: JTextField
+    private lateinit var modNameField: JTextField
+    private lateinit var modVersionField: JTextField
     private lateinit var mainClassField: JTextField
     private lateinit var panel: JPanel
     private lateinit var title: JLabel
@@ -89,12 +89,12 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
             return null
         }
 
-        pluginNameField.text = WordUtils.capitalize(creator.artifactId)
-        pluginVersionField.text = creator.version
+        modNameField.text = WordUtils.capitalize(creator.artifactId)
+        modVersionField.text = creator.version
 
         if (settings != null && !settings!!.isFirst) {
-            pluginNameField.isEditable = false
-            pluginVersionField.isEditable = false
+            modNameField.isEditable = false
+            modVersionField.isEditable = false
         }
 
         mainClassField.text = "${this.creator.groupId.toLowerCase()}.${this.creator.artifactId.toLowerCase()}." +
@@ -162,7 +162,7 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
         }
 
     override fun validate(): Boolean {
-        return validate(pluginNameField, pluginVersionField, mainClassField, authorsField, dependField, MinecraftModuleWizardStep.pattern) && !loadingBar.isVisible
+        return validate(modNameField, modVersionField, mainClassField, authorsField, dependField, MinecraftModuleWizardStep.pattern) && !loadingBar.isVisible
     }
 
     override fun isStepVisible(): Boolean {
@@ -178,8 +178,8 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
         }
 
         settings!!.apply {
-            pluginName = pluginNameField.text
-            pluginVersion = pluginVersionField.text
+            pluginName = modNameField.text
+            pluginVersion = modVersionField.text
             mainClass = mainClassField.text
 
             setAuthors(authorsField.text)
@@ -191,10 +191,9 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
             mcpVersion = (mcpVersionBox.selectedItem as McpVersionEntry).text
         }
 
-        if (settings is SpongeForgeProjectConfiguration) {
-            val configuration = settings as SpongeForgeProjectConfiguration?
-            configuration!!.generateDocumentation = generateDocsCheckbox.isSelected
-            configuration.spongeApiVersion = minecraftVersionBox.selectedItem as String
+        (settings as? SpongeForgeProjectConfiguration)?.let { settings ->
+            settings.generateDocumentation = generateDocsCheckbox.isSelected
+            settings.spongeApiVersion = minecraftVersionBox.selectedItem as String
         }
 
         // If an error occurs while fetching the API, this may prevent the user from closing the dialog.