diff --git a/build.gradle b/build.gradle index b17aada..e5fcdb1 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ version = "2.0.3" archivesBaseName = rootProject.name + '-MC1.8' buildscript { - ext.kotlin_version = '1.0.0-beta-4589' + ext.kotlin_version = '1.0.0' repositories { mavenCentral() maven { diff --git a/src/main/kotlin/mods/betterfoliage/client/config/BlockMatcher.kt b/src/main/kotlin/mods/betterfoliage/client/config/BlockMatcher.kt index c9811bd..1e2f8cb 100644 --- a/src/main/kotlin/mods/betterfoliage/client/config/BlockMatcher.kt +++ b/src/main/kotlin/mods/betterfoliage/client/config/BlockMatcher.kt @@ -22,8 +22,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent */ class BlockMatcher(val domain: String, val path: String) : ConfigPropertyBase() { - val blackList = linkedListOf>() - val whiteList = linkedListOf>() + val blackList = mutableListOf>() + val whiteList = mutableListOf>() val blockIDs = hashSetOf() var blacklistProperty: Property? = null var whitelistProperty: Property? = null diff --git a/src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt b/src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt index 70acb50..4531826 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt @@ -19,7 +19,7 @@ import java.util.* class EntityRisingSoulFX(world: World, pos: BlockPos) : AbstractEntityFX(world, pos.x.toDouble() + 0.5, pos.y.toDouble() + 1.0, pos.z.toDouble() + 0.5) { - val particleTrail: Deque = linkedListOf() + val particleTrail: Deque = LinkedList() val initialPhase = rand.nextInt(64) init { diff --git a/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt b/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt index 7f2ef10..54ea3b4 100644 --- a/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt +++ b/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt @@ -17,7 +17,7 @@ class TextureMatcher() { } } - val mappings: MutableList = linkedListOf() + val mappings: MutableList = mutableListOf() fun getType(icon: TextureAtlasSprite): String? = mappings.filter { it.matches(icon) }.map { it.type }.firstOrNull() diff --git a/src/main/kotlin/mods/octarinecore/client/render/Model.kt b/src/main/kotlin/mods/octarinecore/client/render/Model.kt index 70ce98c..19da9f8 100644 --- a/src/main/kotlin/mods/octarinecore/client/render/Model.kt +++ b/src/main/kotlin/mods/octarinecore/client/render/Model.kt @@ -91,7 +91,7 @@ data class Quad(val v1: Vertex, val v2: Vertex, val v3: Vertex, val v4: Vertex) */ class Model() { constructor(other: List) : this() { quads.addAll(other) } - val quads = linkedListOf() + val quads = mutableListOf() fun Quad.add() = quads.add(this) fun Iterable.addAll() = forEach { quads.add(it) } diff --git a/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt b/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt index edf97c8..70ab715 100644 --- a/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt +++ b/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt @@ -53,7 +53,7 @@ abstract class ModelDataInspector { abstract class BlockTextureInspector : ModelDataInspector() { val state2Names = hashMapOf>() - val modelMappings = linkedListOfBoolean, Iterable>>() + val modelMappings = mutableListOfBoolean, Iterable>>() val stateMap = hashMapOf() fun match(textureNames: Iterable, predicate: (IBlockState, IModel)->Boolean) = diff --git a/src/main/kotlin/mods/octarinecore/client/resource/ResourceHandler.kt b/src/main/kotlin/mods/octarinecore/client/resource/ResourceHandler.kt index 836fcd0..e3e7043 100644 --- a/src/main/kotlin/mods/octarinecore/client/resource/ResourceHandler.kt +++ b/src/main/kotlin/mods/octarinecore/client/resource/ResourceHandler.kt @@ -34,7 +34,7 @@ interface IWorldLoadListener { fun onWorldLoad(world: World) } */ open class ResourceHandler(val modId: String) { - val resources = linkedListOf() + val resources = mutableListOf() open fun afterStitch() {} // ============================ diff --git a/src/main/kotlin/mods/octarinecore/client/resource/TextureGenerator.kt b/src/main/kotlin/mods/octarinecore/client/resource/TextureGenerator.kt index 308139d..2e74fa4 100644 --- a/src/main/kotlin/mods/octarinecore/client/resource/TextureGenerator.kt +++ b/src/main/kotlin/mods/octarinecore/client/resource/TextureGenerator.kt @@ -79,7 +79,7 @@ abstract class TextureGenerator(domain: String) : ParameterBasedGenerator(domain */ fun getMultisizeTexture(maxSize: Int, maskPath: (Int)->ResourceLocation): IResource? { var size = maxSize - val sizes = linkedListOf() + val sizes = mutableListOf() while(size > 2) { sizes.add(size); size /= 2 } return sizes.map { resourceManager[maskPath(it)] }.filterNotNull().firstOrNull() } diff --git a/src/main/kotlin/mods/octarinecore/common/config/DelegatingConfig.kt b/src/main/kotlin/mods/octarinecore/common/config/DelegatingConfig.kt index 9987197..28eb7ee 100644 --- a/src/main/kotlin/mods/octarinecore/common/config/DelegatingConfig.kt +++ b/src/main/kotlin/mods/octarinecore/common/config/DelegatingConfig.kt @@ -37,7 +37,7 @@ abstract class DelegatingConfig(val modId: String, val langPrefix: String) { /** The [Configuration] backing this config object. */ var config: Configuration? = null - val rootGuiElements = linkedListOf() + val rootGuiElements = mutableListOf() /** Attach this config object to the given [Configuration] and update all properties. */ fun attach(config: Configuration) {