add jankson dependency
This commit is contained in:
parent
e84f616d9b
commit
240bff1677
|
@ -1,3 +1,6 @@
|
||||||
[submodule "api"]
|
[submodule "api"]
|
||||||
path = api
|
path = api
|
||||||
url = https://github.com/NikkyAI/MatterLinkApi.git
|
url = https://github.com/NikkyAI/MatterLinkApi.git
|
||||||
|
[submodule "Jankson"]
|
||||||
|
path = Jankson
|
||||||
|
url = https://github.com/falkreon/Jankson.git
|
||||||
|
|
|
@ -4,18 +4,20 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url = "http://files.minecraftforge.net/maven" }
|
maven { url = "http://files.minecraftforge.net/maven" }
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
url 'https://plugins.gradle.org/m2/'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
|
classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
|
||||||
|
classpath "com.github.jengelman.gradle.plugins:shadow:2.0.0"
|
||||||
|
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "com.github.johnrengelman.shadow" version "1.2.4"
|
|
||||||
id 'com.matthewprenger.cursegradle' version '1.0.10'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||||
|
apply plugin: "com.github.johnrengelman.shadow"
|
||||||
|
apply plugin: 'com.matthewprenger.cursegradle'
|
||||||
|
|
||||||
version = project.mc_version + "-" + project.mod_version
|
version = project.mc_version + "-" + project.mod_version
|
||||||
|
|
||||||
|
@ -31,9 +33,12 @@ dependencies {
|
||||||
shadowJar {
|
shadowJar {
|
||||||
classifier ''
|
classifier ''
|
||||||
|
|
||||||
|
relocate "blue.endless", "matterlink.repack.blue.endless"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
include project(":core")
|
include project(":core")
|
||||||
include project(":api")
|
include project(":api")
|
||||||
|
include project(":Jankson")
|
||||||
}
|
}
|
||||||
|
|
||||||
exclude 'dummyThing'
|
exclude 'dummyThing'
|
||||||
|
|
|
@ -43,6 +43,7 @@ object EventHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun chatEvent(e: ServerChatEvent) {
|
fun chatEvent(e: ServerChatEvent) {
|
||||||
|
if(e.isCanceled) return
|
||||||
ChatProcessor.sendToBridge(
|
ChatProcessor.sendToBridge(
|
||||||
user = e.player.displayName.unformattedText,
|
user = e.player.displayName.unformattedText,
|
||||||
msg = e.message,
|
msg = e.message,
|
||||||
|
|
|
@ -3,18 +3,23 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url = "http://files.minecraftforge.net/maven" }
|
maven { url = "http://files.minecraftforge.net/maven" }
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
url = 'https://oss.sonatype.org/content/groups/public'
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url = "https://plugins.gradle.org/m2/"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
|
classpath "net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT"
|
||||||
|
classpath "com.github.jengelman.gradle.plugins:shadow:2.0.0"
|
||||||
|
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "com.github.johnrengelman.shadow" version "1.2.4"
|
|
||||||
id 'com.matthewprenger.cursegradle' version '1.0.10'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||||
|
apply plugin: "com.github.johnrengelman.shadow"
|
||||||
|
apply plugin: 'com.matthewprenger.cursegradle'
|
||||||
|
|
||||||
version = project.mc_version + "-" + project.mod_version
|
version = project.mc_version + "-" + project.mod_version
|
||||||
|
|
||||||
|
@ -30,9 +35,12 @@ dependencies {
|
||||||
shadowJar {
|
shadowJar {
|
||||||
classifier ''
|
classifier ''
|
||||||
|
|
||||||
|
relocate "blue.endless", "matterlink.repack.blue.endless"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
include project(":core")
|
include project(":core")
|
||||||
include project(":api")
|
include project(":api")
|
||||||
|
include project(":Jankson")
|
||||||
}
|
}
|
||||||
|
|
||||||
exclude 'dummyThing'
|
exclude 'dummyThing'
|
||||||
|
|
|
@ -44,6 +44,7 @@ object EventHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun chatEvent(e: ServerChatEvent) {
|
fun chatEvent(e: ServerChatEvent) {
|
||||||
|
if(e.isCanceled) return
|
||||||
ChatProcessor.sendToBridge(
|
ChatProcessor.sendToBridge(
|
||||||
user = e.player.displayName.unformattedText,
|
user = e.player.displayName.unformattedText,
|
||||||
msg = e.message,
|
msg = e.message,
|
||||||
|
|
|
@ -3,18 +3,23 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url = "http://files.minecraftforge.net/maven" }
|
maven { url = "http://files.minecraftforge.net/maven" }
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
url = 'https://oss.sonatype.org/content/groups/public'
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url = "https://plugins.gradle.org/m2/"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
|
classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
|
||||||
|
classpath "com.github.jengelman.gradle.plugins:shadow:2.0.0"
|
||||||
|
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "com.github.johnrengelman.shadow" version "1.2.4"
|
|
||||||
id 'com.matthewprenger.cursegradle' version '1.0.10'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||||
|
apply plugin: "com.github.johnrengelman.shadow"
|
||||||
|
apply plugin: 'com.matthewprenger.cursegradle'
|
||||||
|
|
||||||
version = project.mc_version + "-" + project.mod_version
|
version = project.mc_version + "-" + project.mod_version
|
||||||
|
|
||||||
|
@ -30,9 +35,12 @@ dependencies {
|
||||||
shadowJar {
|
shadowJar {
|
||||||
classifier ''
|
classifier ''
|
||||||
|
|
||||||
|
relocate "blue.endless", "matterlink.repack.blue.endless"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
include project(":core")
|
include project(':core')
|
||||||
include project(":api")
|
include project(":api")
|
||||||
|
include project(":Jankson")
|
||||||
}
|
}
|
||||||
|
|
||||||
exclude 'dummyThing'
|
exclude 'dummyThing'
|
||||||
|
|
|
@ -36,6 +36,7 @@ object EventHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun chatEvent(e: ServerChatEvent) {
|
fun chatEvent(e: ServerChatEvent) {
|
||||||
|
if(e.isCanceled) return
|
||||||
ChatProcessor.sendToBridge(
|
ChatProcessor.sendToBridge(
|
||||||
user = e.player.displayName.unformattedText,
|
user = e.player.displayName.unformattedText,
|
||||||
msg = e.message,
|
msg = e.message,
|
||||||
|
|
|
@ -3,17 +3,18 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url = "http://files.minecraftforge.net/maven" }
|
maven { url = "http://files.minecraftforge.net/maven" }
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
url = "https://plugins.gradle.org/m2/"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
|
classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
|
||||||
|
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.0.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id 'com.matthewprenger.cursegradle' version '1.0.10'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
|
apply plugin: 'com.matthewprenger.cursegradle'
|
||||||
|
|
||||||
version = project.mc_version + "-" + project.mod_version
|
version = project.mc_version + "-" + project.mod_version
|
||||||
|
|
||||||
|
@ -27,8 +28,9 @@ configurations {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
shade project(":core")
|
shade project(':core')
|
||||||
shade project(":api")
|
shade project(":api")
|
||||||
|
shade project(":Jankson")
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
|
@ -42,6 +44,7 @@ minecraft {
|
||||||
// srgExtra "PK: org/apache/http matterlink/repack/org/apache/http"
|
// srgExtra "PK: org/apache/http matterlink/repack/org/apache/http"
|
||||||
// srgExtra "PK: org/apache/commons matterlink/repack/org/apache/commons"
|
// srgExtra "PK: org/apache/commons matterlink/repack/org/apache/commons"
|
||||||
srgExtra "PK: org/intellij matterlink/repack/org/intellij"
|
srgExtra "PK: org/intellij matterlink/repack/org/intellij"
|
||||||
|
srgExtra "PK: blue/endless matterlink/repack/blue/endless"
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin.doFirst {
|
compileKotlin.doFirst {
|
||||||
|
|
|
@ -40,6 +40,7 @@ object EventHandler {
|
||||||
//FORGE-DEPENDENT
|
//FORGE-DEPENDENT
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
fun chatEvent(e: ServerChatEvent) {
|
fun chatEvent(e: ServerChatEvent) {
|
||||||
|
if(e.isCanceled) return
|
||||||
ChatProcessor.sendToBridge(
|
ChatProcessor.sendToBridge(
|
||||||
user = e.player.displayName,
|
user = e.player.displayName,
|
||||||
msg = e.message,
|
msg = e.message,
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit ce97d00016a58a4402d919155efa0fccec5ea9e6
|
|
@ -29,6 +29,11 @@ subprojects {
|
||||||
name = "shadowfacts"
|
name = "shadowfacts"
|
||||||
url = "http://maven.shadowfacts.net/"
|
url = "http://maven.shadowfacts.net/"
|
||||||
}
|
}
|
||||||
|
ivy {
|
||||||
|
//Resolves jankson
|
||||||
|
name "endless.blue dependency mirror";
|
||||||
|
artifactPattern "https://endless.blue/files/ivy/[module]-[revision].[ext]";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,28 +1,31 @@
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.2.21'
|
ext.kotlin_version = '1.2.41'
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
url = 'https://oss.sonatype.org/content/groups/public'
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url = "https://plugins.gradle.org/m2/";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
classpath "com.github.jengelman.gradle.plugins:shadow:2.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
|
||||||
id "com.github.johnrengelman.shadow" version "1.2.4"
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
apply plugin: "com.github.johnrengelman.shadow"
|
||||||
|
|
||||||
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
|
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
|
||||||
|
|
||||||
repositories {
|
|
||||||
jcenter()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(':api')
|
compile project(':api')
|
||||||
|
|
||||||
|
compile project(":Jankson")
|
||||||
|
|
||||||
compile group: 'commons-logging', name: 'commons-logging', version: '1.1.3'
|
compile group: 'commons-logging', name: 'commons-logging', version: '1.1.3'
|
||||||
compile group: 'com.google.code.gson', name: 'gson', version: '+'
|
compile group: 'com.google.code.gson', name: 'gson', version: '+'
|
||||||
|
|
||||||
|
@ -40,5 +43,6 @@ shadowJar {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
include project(":api")
|
include project(":api")
|
||||||
|
include project(":Jankson")
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
rootProject.name = 'MatterLink'
|
rootProject.name = 'MatterLink'
|
||||||
include 'core', 'api', '1.12.2', '1.11.2', '1.10.2', '1.7.10'
|
include 'core', 'api'
|
||||||
|
include 'Jankson'
|
||||||
|
include '1.12.2', '1.11.2', '1.10.2', '1.7.10'
|
Loading…
Reference in New Issue