From fd9178482200bfe58ff283085fd76a0c4f8f7b86 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Wed, 24 Jun 2020 09:35:52 -0700
Subject: Update Kotlin for Forge 1.3.1
---
.gitignore | 1 +
build.gradle | 17 +++---
changelog.md | 18 ++++---
src/main/resources/META-INF/mods.toml | 6 +--
.../1.3.1/kotlinforforge-1.3.1-sources.jar | Bin 0 -> 16676 bytes
.../1.3.1/kotlinforforge-1.3.1-sources.jar.md5 | 1 +
.../1.3.1/kotlinforforge-1.3.1-sources.jar.sha1 | 1 +
.../kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar | Bin 0 -> 89548 bytes
.../1.3.1/kotlinforforge-1.3.1.jar.md5 | 1 +
.../1.3.1/kotlinforforge-1.3.1.jar.sha1 | 1 +
.../kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom | 60 +++++++++++++++++++++
.../1.3.1/kotlinforforge-1.3.1.pom.md5 | 1 +
.../1.3.1/kotlinforforge-1.3.1.pom.sha1 | 1 +
thedarkcolour/kotlinforforge/1.3.1/web.html | 20 +++++++
thedarkcolour/kotlinforforge/maven-metadata.xml | 3 +-
.../kotlinforforge/maven-metadata.xml.md5 | 2 +-
.../kotlinforforge/maven-metadata.xml.sha1 | 2 +-
17 files changed, 112 insertions(+), 23 deletions(-)
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.md5
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar.sha1
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.md5
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar.sha1
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.md5
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.pom.sha1
create mode 100644 thedarkcolour/kotlinforforge/1.3.1/web.html
diff --git a/.gitignore b/.gitignore
index 096ab59..38d5de4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
new file mode 100644
index 0000000..b8642b9
Binary files /dev/null and b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1-sources.jar differ
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
new file mode 100644
index 0000000..1ba28a1
Binary files /dev/null and b/thedarkcolour/kotlinforforge/1.3.1/kotlinforforge-1.3.1.jar differ
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 @@
+
+
../ +kotlinforforge-1.3.1-sources.jar +kotlinforforge-1.3.1-sources.jar.sha1 +kotlinforforge-1.3.1-sources.jar.md5 +kotlinforforge-1.3.1.jar +kotlinforforge-1.3.1.jar.sha1 +kotlinforforge-1.3.1.jar.md5 +kotlinforforge-1.3.1.pom +kotlinforforge-1.3.1.pom.sha1 +kotlinforforge-1.3.1.pom.md5 ++