Update to Kotlin for Forge 1.4.1

16 files changed, 97 insertions, 5 deletions

diff --git a/build.gradle b/build.gradle
index b789ad0..46cdb16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.dokka'
 
-version = "1.4.0"
+version = "1.4.1"
 group = 'thedarkcolour.kotlinforforge'
 archivesBaseName = 'kotlinforforge'
 
diff --git a/changelog.md b/changelog.md
index 3827933..a8656cf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,6 @@
+##Kotlin for Forge 1.4.1
+- Fixed `KDeferredRegistry` registering things out of order
+
 ##Kotlin for Forge 1.4.0
 - Kotlin Gradle Plugin now requires Gradle 5.3. Update by changing the version of the gradle wrapper in `gradle/wrapper/gradle-wrapper.properties`.
 - Added a `KDeferredRegistry` similar to Forge's `DeferredRegistry` but works with `ObjectHolderDelegate`s instead of `RegistryObject`s.
diff --git a/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinForForge.kt b/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinForForge.kt
index eeaaef4..237c445 100644
--- a/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinForForge.kt
+++ b/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinForForge.kt
@@ -5,12 +5,12 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext
 
 /**
  * Set `modLoader` in mods.toml to
- * `"kotlinforforge"` and loaderVersion to `"[1.3,1.4)"`.
+ * `"kotlinforforge"` and loaderVersion to `"[1.4,)"`.
  *
  * Make sure to use [KotlinModLoadingContext]
  * instead of [FMLJavaModLoadingContext].
  *
- * For a more thorough example mod,
+ * For a more detailed example mod,
  * check out the [KotlinModdingSkeleton repository](https://github.com/thedarkcolour/KotlinModdingSkeleton).
  */
 @Mod("kotlinforforge")
diff --git a/src/main/kotlin/thedarkcolour/kotlinforforge/forge/KDeferredRegister.kt b/src/main/kotlin/thedarkcolour/kotlinforforge/forge/KDeferredRegister.kt
index f556d0f..e4f40e9 100644
--- a/src/main/kotlin/thedarkcolour/kotlinforforge/forge/KDeferredRegister.kt
+++ b/src/main/kotlin/thedarkcolour/kotlinforforge/forge/KDeferredRegister.kt
@@ -22,7 +22,7 @@ public class KDeferredRegister<V : IForgeRegistryEntry<V>>(
     /**
      * A map of all registry objects and their value suppliers.
      */
-    private val entries = HashMap<ObjectHolderDelegate<out V>, () -> V>()
+    private val entries = LinkedHashMap<ObjectHolderDelegate<out V>, () -> V>()
 
     /**
      * Alternative constructor that uses a class instead of a registry.
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar
new file mode 100644
index 0000000..c1785b5
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar.md5 b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar.md5
new file mode 100644
index 0000000..8b31a18
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar.md5
@@ -0,0 +1 @@
+073d2a8ffb10fdc9d0f0cb1d170821be
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar.sha1 b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar.sha1
new file mode 100644
index 0000000..24fb2e1
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1-sources.jar.sha1
@@ -0,0 +1 @@
+e2ffd7e63fa65da4177fa95890774b890fac2533
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar
new file mode 100644
index 0000000..1dc4ad6
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar.md5 b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar.md5
new file mode 100644
index 0000000..feaaae2
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar.md5
@@ -0,0 +1 @@
+feb6bc90c3c8be2cab58eeb5a12d20a7
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar.sha1 b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar.sha1
new file mode 100644
index 0000000..86c84b9
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.jar.sha1
@@ -0,0 +1 @@
+fdeed7df46a2afc10a5a24ce6d28c12f5240123c
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom
new file mode 100644
index 0000000..9aee9f8
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>thedarkcolour</groupId>
+    <artifactId>kotlinforforge</artifactId>
+    <version>1.4.1</version>
+    <repositories>
+        <repository>
+            <id>kt-eap</id>
+            <name>Kotlin Early Access</name>
+            <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk7</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>1.4.0-rc</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>19.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-core</artifactId>
+            <version>1.3.7</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-coroutines-jdk8</artifactId>
+            <version>1.3.7</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom.md5 b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom.md5
new file mode 100644
index 0000000..89a88a9
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom.md5
@@ -0,0 +1 @@
+01891273a472255f87c0993002d9ce77
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom.sha1 b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom.sha1
new file mode 100644
index 0000000..edcd02e
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/kotlinforforge-1.4.1.pom.sha1
@@ -0,0 +1 @@
+9eb0116d6347659b5c49df0630ae294a30a130c7
\ No newline at end of file
diff --git a/thedarkcolour/kotlinforforge/1.4.1/web.html b/thedarkcolour/kotlinforforge/1.4.1/web.html
new file mode 100644
index 0000000..a5bab15
--- /dev/null
+++ b/thedarkcolour/kotlinforforge/1.4.1/web.html
@@ -0,0 +1,20 @@
+<html lang="HTML5">
+<link rel="stylesheet" href="../../style.css">
+<head><title>Index of /1.4.1/</title></head>
+<body>
+<h1>Index of /kotlinforforge/</h1>
+<hr>
+<pre><a href="../web.html">../</a>
+<a href="kotlinforforge-1.4.1-sources.jar">kotlinforforge-1.4.1-sources.jar</a>
+<a href="kotlinforforge-1.4.1-sources.jar.sha1">kotlinforforge-1.4.1-sources.jar.sha1</a>
+<a href="kotlinforforge-1.4.1-sources.jar.md5">kotlinforforge-1.4.1-sources.jar.md5</a>
+<a href="kotlinforforge-1.4.1.jar">kotlinforforge-1.4.1.jar</a>
+<a href="kotlinforforge-1.4.1.jar.sha1">kotlinforforge-1.4.1.jar.sha1</a>
+<a href="kotlinforforge-1.4.1.jar.md5">kotlinforforge-1.4.1.jar.md5</a>
+<a href="kotlinforforge-1.4.1.pom">kotlinforforge-1.4.1.pom</a>
+<a href="kotlinforforge-1.4.1.pom.sha1">kotlinforforge-1.4.1.pom.sha1</a>
+<a href="kotlinforforge-1.4.1.pom.md5">kotlinforforge-1.4.1.pom.md5</a>
+</pre>
+<hr>
+</body>
+</html>
diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml b/thedarkcolour/kotlinforforge/maven-metadata.xml
index 6745bc5..85237c7 100644
--- a/thedarkcolour/kotlinforforge/maven-metadata.xml
+++ b/thedarkcolour/kotlinforforge/maven-metadata.xml
@@ -3,7 +3,7 @@
     <groupId>thedarkcolour</groupId>
     <artifactId>kotlinforforge</artifactId>
     <versioning>
-        <release>1.4.0</release>
+        <release>1.4.1</release>
         <versions>
             <version>1.0.0</version>
             <version>1.0.1</version>
@@ -14,6 +14,7 @@
             <version>1.3.0</version>
             <version>1.3.1</version>
             <version>1.4.0</version>
+            <version>1.4.1</version>
         </versions>
     </versioning>
 </metadata>
diff --git a/thedarkcolour/kotlinforforge/web.html b/thedarkcolour/kotlinforforge/web.html
index 90eeb5f..fc75942 100644
--- a/thedarkcolour/kotlinforforge/web.html
+++ b/thedarkcolour/kotlinforforge/web.html
@@ -16,6 +16,8 @@
 <a href="1.2.2/web.html">1.2.2</a>
 <a href="1.3.0/web.html">1.3.0</a>
 <a href="1.3.1/web.html">1.3.1</a>
+<a href="1.4.0/web.html">1.4.0</a>
+<a href="1.4.1/web.html">1.4.1</a>
 <a href="maven-metadata.xml">maven-metadata.xml</a>
 <a href="maven-metadata.xml.md5">maven-metadata.xml.md5</a>
 <a href="maven-metadata.xml.sha1">maven-metadata.xml.sha1</a>