diff options
17 files changed, 112 insertions, 23 deletions
@@ -24,3 +24,4 @@ run # Files from Forge MDK forge*changelog.txt gradle +lib diff --git a/build.gradle b/build.gradle index 0722f28..af88d50 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ buildscript { maven { url = 'https://files.minecraftforge.net/maven' } maven { url = "https://maven.tterrag.com/" } maven { url = "https://dl.bintray.com/kotlin/kotlin-eap" } + maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } jcenter() mavenCentral() } @@ -10,6 +11,7 @@ buildscript { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.10.1' + classpath group: 'com.wynprice.cursemaven', name: 'CurseMaven', version: '2.1.5' } } plugins { @@ -20,7 +22,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'kotlin' apply plugin: 'org.jetbrains.dokka' -version = "1.3.0" +version = "1.3.1" group = 'thedarkcolour.kotlinforforge' archivesBaseName = 'kotlinforforge' @@ -75,6 +77,10 @@ repositories { name = 'Dokka' url = 'https://dl.bintray.com/kotlin/dokka' } + maven { + name = "CurseForge" + url = "https://minecraft.curseforge.com/api/maven/" + } } dependencies { @@ -124,15 +130,8 @@ compileKotlin { } } -sourceSets.test { - kotlin.srcDirs 'src/example/kotlin' - resources.srcDirs 'src/example/resources' -} - kotlinSourcesJar { - from(sourceSets.main.kotlin.srcDirs).eachFile { file -> - println(file.name) - } + from(sourceSets.main.kotlin.srcDirs) } dokka { diff --git a/changelog.md b/changelog.md index d4fdf03..c44571e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,13 @@ -Kotlin for Forge 1.3.0 +##Kotlin for Forge 1.3.1 +- Bumped version range to work with 1.16 Forge when it comes out. + +##Kotlin for Forge 1.3.0 - Added a modding skeleton repository as an alternative to editing the build.gradle the Forge MDK ships with. - Added two more reified generic functions to the KotlinEventBus for `priority` and `receivedCancelled` parameters. - Fixed the ObjectHolderDelegate not allowing subtypes of classes that implement IForgeRegistryEntry - Updated to Kotlin 1.4-M2, Updated to coroutines 1.3.7 -- **KFF 1.3.x is not compatible with versions earlier than 1.2.3 due to Kotlin Reflection changes in 1.4-M2** -Kotlin for Forge 1.2.2 +##Kotlin for Forge 1.2.2 - Added a sided delegate class which returns a "client value" on the client side and a "server value" on the server side. - Added a new utility file called "Kotlin.kt" that provides a few utility functions not related to Minecraft Forge. - Added an example mod. I will make a template GitHub repository for Kotlin for Forge soon. @@ -13,21 +15,21 @@ Kotlin for Forge 1.2.2 - Restructured Kotlin for Forge code to use Kotlin APIs whenever possible - Added styling to the maven repo -Kotlin for Forge 1.2.1 +##Kotlin for Forge 1.2.1 - Added backwards compatibility to mods that used versions of Kotlin for Forge before 1.2.0 -Kotlin for Forge 1.2.0 +##Kotlin for Forge 1.2.0 - Added a Kotlin implementation of the Forge EventBus that has working addListener and addGenericListener functions - Added an overload of addGenericListener that uses a reified type parameter instead of a class parameter. - Updated to Kotlin 1.4-M1 -Kotlin for Forge 1.1.0 +##Kotlin for Forge 1.1.0 - Events now properly fire through KotlinModContainer - Updated to Kotlin 1.3.70, Updated to coroutines 1.3.4, Updated to JetBrains annotations 19.0.0 -Kotlin for Forge 1.0.1 +##Kotlin for Forge 1.0.1 - Fixed an issue with language extensions - Fixed an internal crash -Kotlin for Forge 1.0.0 +##Kotlin for Forge 1.0.0 - Initial release for 1.14 and 1.15
\ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index aef9147..6de045b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,7 +1,7 @@ modLoader="kotlinforforge" # IModLanguageProvider loaderVersion="[1.3,)" # IModLanguageProvider version -issueTrackerURL="https://github.com/thedarkcolour/Future-MC/issues" # Issues page +issueTrackerURL="https://github.com/thedarkcolour/KotlinForForge/issues" # Issues page description=''' Kotlin for Forge. Allows mods to use the Kotlin programming language. @@ -20,7 +20,7 @@ Kotlin for Forge. Allows mods to use the Kotlin programming language. [[dependencies.kotlinforforge]] modId="minecraft" mandatory=true - versionRange="[1.14,1.16)" + versionRange="[1.14,1.17)" ordering="NONE" side="BOTH" @@ -31,6 +31,6 @@ Kotlin for Forge. Allows mods to use the Kotlin programming language. [[mods]] #mandatory displayName="Kotlin for Forge" # Name of mod modId="kotlinforforge" # Modid -version="1.3.0" # Version of kotlinforforge +version="1.3.1" # Version of kotlinforforge authors="TheDarkColour" # Author credits="Herobrine knows all." # Credits
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar Binary files differnew file mode 100644 index 0000000..b8642b9 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.md5 b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.md5 new file mode 100644 index 0000000..38af3e4 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.md5 @@ -0,0 +1 @@ +ed2300a854f9b996045eb308b26ea4c6
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.sha1 b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.sha1 new file mode 100644 index 0000000..5572a98 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.sha1 @@ -0,0 +1 @@ +23557fe7f56c45ec496d66dfa84bed2a4f75fcb9
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar Binary files differnew file mode 100644 index 0000000..1ba28a1 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.md5 b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.md5 new file mode 100644 index 0000000..4672937 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.md5 @@ -0,0 +1 @@ +68156c2ee24e2ace93ec3299bd705b75
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.sha1 b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.sha1 new file mode 100644 index 0000000..1cd4e80 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.sha1 @@ -0,0 +1 @@ +7207372304cea13010455e86ab5605cb98b4f35e
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom new file mode 100644 index 0000000..4720e8a --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.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.3.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-M2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk7</artifactId> + <version>1.4-M2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>1.4-M2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>1.4-M2</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.3.1/kotlinforforge-1.3.1.pom.md5 b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.md5 new file mode 100644 index 0000000..df5a932 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.md5 @@ -0,0 +1 @@ +6032d4a7054134eae2baaf52aaeaf39a
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.sha1 b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.sha1 new file mode 100644 index 0000000..543a80f --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.sha1 @@ -0,0 +1 @@ +dc2fdc32479e3c66f1401c4ef90736608b75e9af
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/1.3.1/web.html b/thedarkcolour/kotlinforforge/1.3.1/web.html new file mode 100644 index 0000000..d20aa64 --- /dev/null +++ b/thedarkcolour/kotlinforforge/1.3.1/web.html @@ -0,0 +1,20 @@ +<html lang="HTML5"> +<link rel="stylesheet" href="../../style.css"> +<head><title>Index of /1.3.1/</title></head> +<body> +<h1>Index of /kotlinforforge/</h1> +<hr> +<pre><a href="../web.html">../</a> +<a href="kotlinforforge-1.3.1-sources.jar">kotlinforforge-1.3.1-sources.jar</a> +<a href="kotlinforforge-1.3.1-sources.jar.sha1">kotlinforforge-1.3.1-sources.jar.sha1</a> +<a href="kotlinforforge-1.3.1-sources.jar.md5">kotlinforforge-1.3.1-sources.jar.md5</a> +<a href="kotlinforforge-1.3.1.jar">kotlinforforge-1.3.1.jar</a> +<a href="kotlinforforge-1.3.1.jar.sha1">kotlinforforge-1.3.1.jar.sha1</a> +<a href="kotlinforforge-1.3.1.jar.md5">kotlinforforge-1.3.1.jar.md5</a> +<a href="kotlinforforge-1.3.1.pom">kotlinforforge-1.3.1.pom</a> +<a href="kotlinforforge-1.3.1.pom.sha1">kotlinforforge-1.3.1.pom.sha1</a> +<a href="kotlinforforge-1.3.1.pom.md5">kotlinforforge-1.3.1.pom.md5</a> +</pre> +<hr> +</body> +</html> diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml b/thedarkcolour/kotlinforforge/maven-metadata.xml index a546dc5..fd4e68f 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.3.0</release> + <release>1.3.1</release> <versions> <version>1.0.0</version> <version>1.0.1</version> @@ -12,6 +12,7 @@ <version>1.2.1</version> <version>1.2.2</version> <version>1.3.0</version> + <version>1.3.1</version> </versions> </versioning> </metadata> diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 b/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 index 8ba8db3..3131ca0 100644 --- a/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 +++ b/thedarkcolour/kotlinforforge/maven-metadata.xml.md5 @@ -1 +1 @@ -df48b99b2a7b4071f3683bac2d13b652
\ No newline at end of file +a2d69dca57d7e21404b87543d1d77efd
\ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 b/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 index a439a20..cfa1306 100644 --- a/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 +++ b/thedarkcolour/kotlinforforge/maven-metadata.xml.sha1 @@ -1 +1 @@ -cac5bebca56af1f260e39d81c7195caba88a7ae7
\ No newline at end of file +f647c1e02d53ef1e9b7e00b663c327f0985bcec8
\ No newline at end of file |