diff options
18 files changed, 112 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle index aa1db38..5686edf 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' apply plugin: 'kotlin' -version = '1.2.0' +version = '1.2.1' group = 'thedarkcolour.kotlinforforge' archivesBaseName = 'kotlinforforge' diff --git a/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinModLoadingContext.kt b/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinModLoadingContext.kt index 44aac2d..78aaef7 100644 --- a/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinModLoadingContext.kt +++ b/src/main/kotlin/thedarkcolour/kotlinforforge/KotlinModLoadingContext.kt @@ -1,5 +1,6 @@ package thedarkcolour.kotlinforforge +import net.minecraftforge.eventbus.api.IEventBus import thedarkcolour.kotlinforforge.eventbus.KotlinEventBus import thedarkcolour.kotlinforforge.forge.LOADING_CONTEXT @@ -10,7 +11,16 @@ class KotlinModLoadingContext constructor(private val container: KotlinModContai /** * @see thedarkcolour.kotlinforforge.forge.MOD_BUS */ - fun getEventBus(): KotlinEventBus { + fun getKEventBus(): KotlinEventBus { + return container.eventBus + } + + /** @since 1.2.1 + * @see thedarkcolour.kotlinforforge.forge.MOD_BUS + * + * Required to make mods that use an older version of KFF work. + */ + fun getEventBus(): IEventBus { return container.eventBus } diff --git a/src/main/kotlin/thedarkcolour/kotlinforforge/forge/Forge.kt b/src/main/kotlin/thedarkcolour/kotlinforforge/forge/Forge.kt index e0b9cd8..fe8ee42 100644 --- a/src/main/kotlin/thedarkcolour/kotlinforforge/forge/Forge.kt +++ b/src/main/kotlin/thedarkcolour/kotlinforforge/forge/Forge.kt @@ -40,7 +40,7 @@ val FORGE_BUS = KotlinEventBusWrapper(MinecraftForge.EVENT_BUS as EventBus) * @see net.minecraftforge.event.RegistryEvent */ val MOD_BUS: KotlinEventBus - inline get() = KotlinModLoadingContext.get().getEventBus() + inline get() = KotlinModLoadingContext.get().getKEventBus() /** @since 1.0.0 * Mod context for Kotlin mods. diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar Binary files differnew file mode 100644 index 0000000..1ec7f1e --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar.md5 b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar.md5 new file mode 100644 index 0000000..1b66d2a --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar.md5 @@ -0,0 +1 @@ +13bce0f678c2210c8c8ef624b85eedc9
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar.sha1 b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar.sha1 new file mode 100644 index 0000000..17533d6 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1-sources.jar.sha1 @@ -0,0 +1 @@ +facc2a29125f44cf8fddb69a2505ec85561da2f3
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar Binary files differnew file mode 100644 index 0000000..9e8adb3 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar.md5 b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar.md5 new file mode 100644 index 0000000..c344bb1 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar.md5 @@ -0,0 +1 @@ +b1475c31dca21ada89adee34e7f44d7f
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar.sha1 b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar.sha1 new file mode 100644 index 0000000..e72a0c9 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.jar.sha1 @@ -0,0 +1 @@ +a2170621ceda2e97422601a96e032a00ec6876cd
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom new file mode 100644 index 0000000..56a09b2 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom @@ -0,0 +1,59 @@ +<?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.2.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-M1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk7</artifactId> + <version>1.4-M1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>1.4-M1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>1.4-M1</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.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlinx</groupId> + <artifactId>kotlinx-coroutines-jdk8</artifactId> + <version>1.3.4</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom.md5 b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom.md5 new file mode 100644 index 0000000..c928eda --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom.md5 @@ -0,0 +1 @@ +752a6b44af0905193df67721577d5e7c
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom.sha1 b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom.sha1 new file mode 100644 index 0000000..f7b1202 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/kotlinforforge-1.2.1.pom.sha1 @@ -0,0 +1 @@ +b85c6c6a3d2f6dfa54f3f9ee696af54175f0eb7a
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.2.1/web.html b/thedarkcolour/kotlinforforge/1.2.1/web.html new file mode 100644 index 0000000..1f82a39 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.2.1/web.html @@ -0,0 +1,15 @@ +<html> +<head><title>Index of /kotlinforforge/</title></head> +<body> +<h1>Index of /kotlinforforge/</h1><hr><pre><a href="../web.html">../</a> +<a href="kotlinforforge-1.2.1-sources.jar">kotlinforforge-1.2.1-sources.jar</a> +<a href="kotlinforforge-1.2.1-sources.jar.sha1">kotlinforforge-1.2.1-sources.jar.sha1</a> +<a href="kotlinforforge-1.2.1-sources.jar.md5">kotlinforforge-1.2.1-sources.jar.md5</a> +<a href="kotlinforforge-1.2.1.jar">kotlinforforge-1.2.1.jar</a> +<a href="kotlinforforge-1.2.1.jar.sha1">kotlinforforge-1.2.1.jar.sha1</a> +<a href="kotlinforforge-1.2.1.jar.md5">kotlinforforge-1.2.1.jar.md5</a> +<a href="kotlinforforge-1.2.1.pom">kotlinforforge-1.2.1.pom</a> +<a href="kotlinforforge-1.2.1.pom.sha1">kotlinforforge-1.2.1.pom.sha1</a> +<a href="kotlinforforge-1.2.1.pom.md5">kotlinforforge-1.2.1.pom.md5</a> +</pre><hr></body> +</html> diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml b/thedarkcolour/kotlinforforge/maven-metadata.xml index c4f6ff0..193f821 100644 --- a/thedarkcolour/kotlinforforge/maven-metadata.xml +++ b/thedarkcolour/kotlinforforge/maven-metadata.xml @@ -3,12 +3,13 @@ <groupId>thedarkcolour</groupId> <artifactId>kotlinforforge</artifactId> <versioning> - <release>1.2.0</release> + <release>1.2.1</release> <versions> <version>1.0.0</version> <version>1.0.1</version> <version>1.1.0</version> <version>1.2.0</version> + <version>1.2.1</version> </versions> </versioning> </metadata> diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 b/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 index 07eb843..8ba8db3 100644 --- a/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 +++ b/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 @@ -1 +1 @@ -f583f067a62b1a9a739d97c05c75f92d
\ No newline at end of file +df48b99b2a7b4071f3683bac2d13b652
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 b/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 index 6c497dc..a439a20 100644 --- a/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 +++ b/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 @@ -1 +1 @@ -867d0acce00f1d6434d23dd45b4bf9fa3a93e18a
\ No newline at end of file +cac5bebca56af1f260e39d81c7195caba88a7ae7
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/web.html b/thedarkcolour/kotlinforforge/web.html index 6cc6723..1213c35 100644 --- a/thedarkcolour/kotlinforforge/web.html +++ b/thedarkcolour/kotlinforforge/web.html @@ -1,13 +1,18 @@ <html> -<head><title>Index of /kotlinforforge/</title></head> +<head> + <title>Index of /kotlinforforge/</title> +</head> <body> -<h1>Index of /kotlinforforge/</h1><hr><pre><a href="../web.html">../</a> +<h1>Index of /kotlinforforge/</h1><hr><pre> +<a href="../web.html">../</a> <a href="1.0.0/web.html">1.0.0</a> <a href="1.0.1/web.html">1.0.1</a> <a href="1.1.0/web.html">1.1.0</a> <a href="1.2.0/web.html">1.2.0</a> +<a href="1.2.0/web.html">1.2.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> -</pre><hr></body> +</pre><hr> +</body> </html> diff --git a/thedarkcolour/web.html b/thedarkcolour/web.html index 330af9a..95c5d57 100644 --- a/thedarkcolour/web.html +++ b/thedarkcolour/web.html @@ -1,7 +1,11 @@ <html> -<head><title>Index of /kotlinforforge/</title></head> +<head> + <title>Index of /thedarkcolour/</title> +</head> <body> -<h1>Index of /kotlinforforge/</h1><hr><pre><a href="../index.html">../</a> +<h1>Index of /thedarkcolour/</h1><hr><pre> +<a href="../index.html">../</a> <a href="kotlinforforge/web.html">kotlinforforge</a> -</pre><hr></body> +</pre><hr> +</body> </html> |