Skip to content

Commit 8aa2f27

Browse files
committed
Version 2017.3-1.1.0
1 parent 3867d80 commit 8aa2f27

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
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 = 2017.3-1.0.0
16+
version = 2017.3-1.1.0
1717
downloadIdeaSources = true

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-2017.3--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-2017.3--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/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacet.kt

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,31 +210,30 @@ class MinecraftFacet(module: Module, name: String, configuration: MinecraftFacet
210210

211211
fun getInstance(module: Module) = FacetManager.getInstance(module).getFacetByType(ID)
212212

213-
fun getChildInstances(module: Module): Set<MinecraftFacet> {
214-
runInlineReadAction {
215-
val instance = getInstance(module)
216-
if (instance != null) {
217-
return setOf(instance)
218-
}
219-
220-
val manager = ModuleManager.getInstance(module.project)
221-
val result = mutableSetOf<MinecraftFacet>()
213+
fun getChildInstances(module: Module) = runInlineReadAction run@{
214+
val instance = getInstance(module)
215+
if (instance != null) {
216+
return@run setOf(instance)
217+
}
222218

223-
for (m in manager.modules) {
224-
val path = manager.getModuleGroupPath(m) ?: continue
225-
val namedModule = manager.findModuleByName(path.last()) ?: continue
219+
val manager = ModuleManager.getInstance(module.project)
220+
val result = mutableSetOf<MinecraftFacet>()
226221

227-
if (namedModule != module) {
228-
continue
229-
}
222+
for (m in manager.modules) {
223+
val path = manager.getModuleGroupPath(m) ?: continue
224+
val namedModule = manager.findModuleByName(path.last()) ?: continue
230225

231-
val facet = getInstance(m) ?: continue
232-
result.add(facet)
226+
if (namedModule != module) {
227+
continue
233228
}
234-
return result
229+
230+
val facet = getInstance(m) ?: continue
231+
result.add(facet)
235232
}
233+
return@run result
236234
}
237235

236+
238237
fun <T : AbstractModule> getInstance(module: Module, type: AbstractModuleType<T>) = getInstance(module)?.getModuleOfType(type)
239238

240239
fun <T : AbstractModule> getInstance(module: Module, vararg types: AbstractModuleType<T>): T? {

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<div>
2929
Please report issues to <a href="https://github.com/minecraft-dev/MinecraftDev/issues">the issue tracker</a>!
3030
<p>
31-
v. 2017.3-1.0.0
31+
v. 2017.3-1.1.0
3232
</div>
3333
]]>
3434
</change-notes>

0 commit comments

Comments
 (0)