From ab5a5bb943e70d7f525f023eebb540bf9ee0ffc6 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Sun, 3 Nov 2019 20:44:02 -0800 Subject: Adding files --- build.gradle | 2 +- .../0.1.14/kotlinforforge-0.1.14-sources.jar | Bin 5809 -> 0 bytes .../0.1.14/kotlinforforge-0.1.14.jar | Bin 5761321 -> 0 bytes .../0.1.14/kotlinforforge-0.1.14.pom | 52 --------------------- src/main/resources/patcher.js | 50 -------------------- .../0.1.14/kotlinforforge-0.1.14-sources.jar | Bin 0 -> 5929 bytes .../0.1.14/kotlinforforge-0.1.14-sources.jar.md5 | 1 + .../0.1.14/kotlinforforge-0.1.14-sources.jar.sha1 | 1 + .../0.1.14/kotlinforforge-0.1.14.jar | Bin 0 -> 65318 bytes .../0.1.14/kotlinforforge-0.1.14.jar.md5 | 1 + .../0.1.14/kotlinforforge-0.1.14.jar.sha1 | 1 + .../0.1.14/kotlinforforge-0.1.14.pom | 52 +++++++++++++++++++++ .../0.1.14/kotlinforforge-0.1.14.pom.md5 | 1 + .../0.1.14/kotlinforforge-0.1.14.pom.sha1 | 1 + 14 files changed, 59 insertions(+), 103 deletions(-) delete mode 100644 file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar delete mode 100644 file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar delete mode 100644 file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom delete mode 100644 src/main/resources/patcher.js create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.md5 create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.sha1 create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.md5 create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.sha1 create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.md5 create mode 100644 thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.sha1 diff --git a/build.gradle b/build.gradle index 13de264..005d8ae 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ dependencies { } shadowJar { - classifier = "" + classifier = "obf" dependencies { include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}")) diff --git a/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar b/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar deleted file mode 100644 index 1feb9be..0000000 Binary files a/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar and /dev/null differ diff --git a/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar b/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar deleted file mode 100644 index 7cec72c..0000000 Binary files a/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar and /dev/null differ diff --git a/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom b/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom deleted file mode 100644 index 92bc3de..0000000 --- a/file/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - thedarkcolour - KotlinForForge - 0.1.14 - - - org.jetbrains.kotlin - kotlin-stdlib - 1.3.50 - compile - - - org.jetbrains.kotlin - kotlin-stdlib-jdk7 - 1.3.50 - compile - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - 1.3.50 - compile - - - org.jetbrains.kotlin - kotlin-reflect - 1.3.50 - compile - - - org.jetbrains - annotations - 16.0.3 - compile - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - 1.3.1 - compile - - - org.jetbrains.kotlinx - kotlinx-coroutines-jdk8 - 1.3.1 - compile - - - diff --git a/src/main/resources/patcher.js b/src/main/resources/patcher.js deleted file mode 100644 index fcfe312..0000000 --- a/src/main/resources/patcher.js +++ /dev/null @@ -1,50 +0,0 @@ -function initializeCoreMod() { -// Unused, remove - return { - 'KotlinPatcher': { - 'target': { - 'type': 'METHOD', - 'class': 'net.minecraftforge.fml.javafmlmod.FMLModContainer', - 'methodName': 'constructMod', - 'methodDesc': '(Lnet/minecraftforge/fml/LifecycleEventProvider$LifecycleEvent;)V' - }, - 'transformer': function (methodNode) { - var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode'); - var FieldInsnNode = Java.type('org.objectweb.asm.tree.FieldInsnNode'); - var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode'); - var InsnList = Java.type('org.objectweb.asm.tree.InsnList'); - var Opcodes = Java.type('org.objectweb.asm.Opcodes'); - var list = new InsnList(); - list.add(new FieldInsnNode(Opcodes.GETSTATIC, "thedarkcolour/kotlinforforge/AutoKotlinEventBusSubscriber", "INSTANCE", "Lthedarkcolour/kotlinforforge/AutoKotlinEventBusSubscriber;")); - list.add(new VarInsnNode(Opcodes.ALOAD, 0)); - list.add(new VarInsnNode(Opcodes.ALOAD, 0)); - list.add(new FieldInsnNode(Opcodes.GETFIELD, 'net/minecraftforge/fml/javafmlmod/FMLModContainer', 'scanResults', 'Lnet/minecraftforge/forgespi/language/ModFileScanData;')); - list.add(new VarInsnNode(Opcodes.ALOAD, 0)); - list.add(new FieldInsnNode(Opcodes.GETFIELD, 'net/minecraftforge/fml/javafmlmod/FMLModContainer', 'modClass', 'Ljava/lang/Class;')); - list.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, 'java/lang/Class', 'getClassLoader', '()Ljava/lang/ClassLoader;', false)); - list.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "thedarkcolour/kotlinforforge/AutoKotlinEventBusSubscriber", "inject", "(Lnet/minecraftforge/fml/ModContainer;Lnet/minecraftforge/forgespi/language/ModFileScanData;Ljava/lang/ClassLoader;)V", false)); - - for (var i = 0; i < 1000; ++i) { - var insn = methodNode.instructions.get(i); - //print('bruh moment'); - if (insn instanceof MethodInsnNode) { - //print('FOUND A METHODINSNNODE'); - if (insn.desc === '(Lnet/minecraftforge/fml/ModContainer;Lnet/minecraftforge/forgespi/language/ModFileScanData;Ljava/lang/ClassLoader;)V') { - methodNode.instructions.insertBefore(insn.getPrevious().getPrevious().getPrevious().getPrevious().getPrevious().getPrevious(), list); - //print('PATCHED FMLMODCONTAINER'); - break; - } - } - } - - //var writer = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES); - //methodNode.accept(writer); - //var reader = new ClassReader(writer.toByteArray()); - //var cn = new ClassNode(); - //reader.accept(cn, 0); - - return methodNode; - } - } - } -} \ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar new file mode 100644 index 0000000..085ef14 Binary files /dev/null and b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar differ diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.md5 b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.md5 new file mode 100644 index 0000000..1a1490f --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.md5 @@ -0,0 +1 @@ +de722d8d8d23859c6679b8deaf445b62 \ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.sha1 b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.sha1 new file mode 100644 index 0000000..09f460c --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14-sources.jar.sha1 @@ -0,0 +1 @@ +f936ba9006860b4116162781f15668c4073ec806 \ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar new file mode 100644 index 0000000..6b873e2 Binary files /dev/null and b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar differ diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.md5 b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.md5 new file mode 100644 index 0000000..da94729 --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.md5 @@ -0,0 +1 @@ +60e1f9b114948faa2d78c7b6963a4872 \ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.sha1 b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.sha1 new file mode 100644 index 0000000..e9f62b3 --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.jar.sha1 @@ -0,0 +1 @@ +742712c81e4efbcef8e5fe5fefee0c928dcfa4ff \ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom new file mode 100644 index 0000000..31f5781 --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom @@ -0,0 +1,52 @@ + + + 4.0.0 + thedarkcolour + kotlinforforge + 0.1.14 + + + org.jetbrains.kotlin + kotlin-stdlib + 1.3.50 + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + 1.3.50 + compile + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.3.50 + compile + + + org.jetbrains.kotlin + kotlin-reflect + 1.3.50 + compile + + + org.jetbrains + annotations + 16.0.3 + compile + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.3.1 + compile + + + org.jetbrains.kotlinx + kotlinx-coroutines-jdk8 + 1.3.1 + compile + + + diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.md5 b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.md5 new file mode 100644 index 0000000..82d7f26 --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.md5 @@ -0,0 +1 @@ +efa8d4c4f41b791d50896bdcd81d7e8e \ No newline at end of file diff --git a/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.sha1 b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.sha1 new file mode 100644 index 0000000..6d58028 --- /dev/null +++ b/thedarkcolour/kotlinforforge/0.1.14/kotlinforforge-0.1.14.pom.sha1 @@ -0,0 +1 @@ +71094316222578b98c840ae5bf343c5106121e10 \ No newline at end of file -- cgit