Skip to content

Commit cc288fc

Browse files
DenWavDenWav
committed
Merge branch 'dev' into 2018.1
# Conflicts: # gradle.properties # readme.md # src/main/resources/META-INF/plugin.xml
2 parents 856dbac + 8aa2f27 commit cc288fc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+570
-314
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ javaVersion = 1.8
1313
kotlinVersion = 1.2.10
1414

1515
group = com.demonwav.minecraft-dev
16-
version = 2018.1-1.0.0
16+
version = 2018.1-1.1.0
1717
downloadIdeaSources = true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sat Jan 13 14:35:28 CST 2018
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

‎intellij-style.xml‎

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
<code_scheme name="DemonWavStyle">
2-
<option name="JAVA_INDENT_OPTIONS">
3-
<value>
4-
<option name="INDENT_SIZE" value="4" />
5-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
6-
<option name="TAB_SIZE" value="4" />
7-
<option name="USE_TAB_CHARACTER" value="false" />
8-
<option name="SMART_TABS" value="false" />
9-
<option name="LABEL_INDENT_SIZE" value="0" />
10-
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
11-
<option name="USE_RELATIVE_INDENTS" value="false" />
12-
</value>
13-
</option>
1+
<code_scheme name="DemonWavStyle" version="173">
142
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
153
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
164
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -57,10 +45,41 @@
5745
<option name="DOWHILE_BRACE_FORCE" value="3" />
5846
<option name="WHILE_BRACE_FORCE" value="3" />
5947
<option name="FOR_BRACE_FORCE" value="3" />
48+
<GroovyCodeStyleSettings>
49+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2147483647" />
50+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2147483647" />
51+
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
52+
<value />
53+
</option>
54+
<option name="IMPORT_LAYOUT_TABLE">
55+
<value>
56+
<package name="" withSubpackages="true" static="true" />
57+
<emptyLine />
58+
<package name="" withSubpackages="true" static="false" />
59+
</value>
60+
</option>
61+
</GroovyCodeStyleSettings>
6062
<JavaCodeStyleSettings>
6163
<option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
6264
<option name="ANNOTATION_PARAMETER_WRAP" value="5" />
6365
<option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
66+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
67+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="200000" />
68+
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
69+
<value>
70+
<package name="com.mumfrey.liteloader.gl.GL" withSubpackages="true" static="true" />
71+
</value>
72+
</option>
73+
<option name="IMPORT_LAYOUT_TABLE">
74+
<value>
75+
<package name="" withSubpackages="true" static="true" />
76+
<emptyLine />
77+
<package name="" withSubpackages="true" static="false" />
78+
</value>
79+
</option>
80+
<option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
81+
<option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
82+
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
6483
</JavaCodeStyleSettings>
6584
<JetCodeStyleSettings>
6685
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
@@ -69,17 +88,44 @@
6988
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
7089
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
7190
</JetCodeStyleSettings>
91+
<codeStyleSettings language="Groovy">
92+
<option name="RIGHT_MARGIN" value="150" />
93+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
94+
<option name="CALL_PARAMETERS_WRAP" value="5" />
95+
<option name="PREFER_PARAMETERS_WRAP" value="true" />
96+
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
97+
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
98+
<option name="METHOD_PARAMETERS_WRAP" value="5" />
99+
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
100+
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
101+
<option name="EXTENDS_LIST_WRAP" value="1" />
102+
<option name="THROWS_LIST_WRAP" value="1" />
103+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
104+
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
105+
<option name="IF_BRACE_FORCE" value="3" />
106+
<option name="WHILE_BRACE_FORCE" value="3" />
107+
<option name="FOR_BRACE_FORCE" value="3" />
108+
<option name="WRAP_ON_TYPING" value="0" />
109+
<indentOptions>
110+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
111+
</indentOptions>
112+
</codeStyleSettings>
72113
<codeStyleSettings language="JAVA">
73-
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
114+
<option name="RIGHT_MARGIN" value="150" />
115+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
74116
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
75-
<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
76117
<option name="CALL_PARAMETERS_WRAP" value="5" />
77118
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
78119
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
79120
<option name="METHOD_PARAMETERS_WRAP" value="5" />
121+
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
122+
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
80123
<option name="RESOURCE_LIST_WRAP" value="5" />
81124
<option name="RESOURCE_LIST_LPAREN_ON_NEXT_LINE" value="true" />
82125
<option name="RESOURCE_LIST_RPAREN_ON_NEXT_LINE" value="true" />
126+
<option name="THROWS_LIST_WRAP" value="1" />
127+
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
128+
<option name="THROWS_KEYWORD_WRAP" value="1" />
83129
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
84130
<option name="TERNARY_OPERATION_WRAP" value="5" />
85131
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
@@ -101,6 +147,20 @@
101147
</indentOptions>
102148
</codeStyleSettings>
103149
<codeStyleSettings language="kotlin">
150+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
151+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
152+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
153+
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
154+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
155+
<option name="CALL_PARAMETERS_WRAP" value="5" />
156+
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
157+
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
158+
<option name="METHOD_PARAMETERS_WRAP" value="5" />
159+
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
160+
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
161+
<option name="EXTENDS_LIST_WRAP" value="1" />
162+
<option name="PARAMETER_ANNOTATION_WRAP" value="5" />
163+
<option name="ENUM_CONSTANTS_WRAP" value="2" />
104164
<indentOptions>
105165
<option name="CONTINUATION_INDENT_SIZE" value="4" />
106166
</indentOptions>

‎readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Minecraft Development for IntelliJ
1010
|**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)|
1111
| **Travis** |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/dev.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
1212

13-
Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.0.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
13+
Info and Documentation [![Current Release](https://img.shields.io/badge/release-2018.1--1.1.0-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
1414
----------------------
1515

1616
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ final class ForgePatcherModelBuilderImpl implements ModelBuilderService {
4949
@Override
5050
ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
5151
return ErrorMessageBuilder.create(
52-
project, e, "MinecraftDev import errors"
52+
project, e, "MinecraftDev import errors"
5353
).withDescription("Unable to build MinecraftDev Forge patcher project configuration")
5454
}
5555
}

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelBuilderImpl.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ final class McpModelBuilderImpl implements ModelBuilderService {
3838
@Override
3939
ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
4040
return ErrorMessageBuilder.create(
41-
project, e, "MinecraftDev import errors"
41+
project, e, "MinecraftDev import errors"
4242
).withDescription("Unable to build MinecraftDev MCP project configuration")
4343
}
4444
}

‎src/main/kotlin/com/demonwav/mcdev/buildsystem/gradle/GradleBuildSystem.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class GradleBuildSystem : BuildSystem() {
148148
runWriteTask {
149149
val wrapperDirPath = VfsUtil.createDirectoryIfMissing(rootDirectory, "gradle/wrapper").path
150150
FileUtils.writeLines(File(wrapperDirPath, "gradle-wrapper.properties"), listOf(
151-
"distributionUrl=https\\://services.gradle.org/distributions/gradle-3.3-bin.zip"
151+
"distributionUrl=https\\://services.gradle.org/distributions/gradle-4.4.1-bin.zip"
152152
))
153153
}
154154

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ class BuildSystemWizardStep(private val creator: MinecraftProjectCreator) : Modu
9393
throw EmptyFieldSetupException(versionField)
9494
}
9595

96-
if (!groupIdField.text.matches("\\S+".toRegex())) {
96+
if (!groupIdField.text.matches(NO_WHITESPACE)) {
9797
throw OtherSetupException("The GroupId field cannot contain any whitespace", groupIdField)
9898
}
9999

100-
if (!artifactIdField.text.matches("\\S+".toRegex())) {
100+
if (!artifactIdField.text.matches(NO_WHITESPACE)) {
101101
throw OtherSetupException("The ArtifactId field cannot contain any whitespace", artifactIdField)
102102
}
103103

@@ -114,4 +114,8 @@ class BuildSystemWizardStep(private val creator: MinecraftProjectCreator) : Modu
114114

115115
return true
116116
}
117+
118+
companion object {
119+
val NO_WHITESPACE = "\\S+".toRegex()
120+
}
117121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
202202
if (fullVersion != null) {
203203
settings!!.forgeVersion = fullVersion
204204
}
205-
settings!!.mcVersion = minecraftVersionBox.selectedItem as String
205+
settings!!.mcVersion = version!!
206206
}
207207

208208
fun error() {

0 commit comments

Comments
 (0)