lambda-plugins · EBSmash · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022
diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
@@ -12,9 +12,6 @@ jobs:
      - name: Check out repository
        uses: actions/checkout@v2

-      - name: Check out submodules
-        uses: snickerbockers/submodules-init@v4
-
      - name: Set up JDK
        uses: actions/setup-java@v1
        with:
@@ -32,6 +29,7 @@ jobs:
          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
          restore-keys: |
            ${{ runner.os }}-gradle-
+
      - name: Gradle build
        run: ./gradlew --build-cache build


diff --git a/README.md b/README.md
@@ -4,4 +4,4 @@ This is a plugin for lambda, an LGPLv3 project, its source code can be found her

 Writes to books from either a file or a character generator for duping

-Usage: ;bookbotplugin file <sign: Boolean> <title: String> or ;bookbotplugin dupe <sign: Boolean>
+Usage: ;bookbotplugin file <sign: Boolean> <title: String> or ;bookbotplugin dupe <sign: Boolean>
diff --git a/build.gradle b/build.gradle
@@ -3,44 +3,45 @@ group project.modGroup

 buildscript {
    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
+        maven { url = 'https://maven.minecraftforge.net/' }
+        maven { url = 'https://repo.spongepowered.org/maven/' }
    }

    dependencies {
        classpath 'net.minecraftforge.gradle:ForgeGradle:4.+'
        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
    }
 }

 apply plugin: 'idea'
 apply plugin: 'kotlin'
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
-
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        useIR = true
-        freeCompilerArgs += '-Xlambdas=indy'
-    }
-}
+apply plugin: 'com.github.johnrengelman.shadow'

 compileJava {
    sourceCompatibility = targetCompatibility = '1.8'
    options.encoding = 'UTF-8'
 }

+compileKotlin.kotlinOptions {
+    freeCompilerArgs += '-Xlambdas=indy'
+    freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
+    freeCompilerArgs += '-Xopt-in=kotlin.contracts.ExperimentalContracts'
+}
+
 repositories {
    maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
    maven { url = 'https://impactdevelopment.github.io/maven/' }
    maven { url = "https://jitpack.io" }
+    mavenCentral()
 }


 minecraft {
-    mappings channel: 'stable', version: '39-1.12'
+    mappings channel: "$mappingsChannel", version: "$mappingsVersion"

    runs {
        client {
@@ -51,12 +52,6 @@ minecraft {

            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                bookbot {
-                    source sourceSets.main
-                }
-            }
        }
    }
 }
@@ -72,13 +67,12 @@ configurations {
 }

 dependencies {
-    minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2860'
+    minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion"

-    // API coming soon
-//    implementation 'com.github.lambda-client:lambda:2.06'
-    implementation(files("lib/lambda-3.1-api.jar"))
+    // Online maven dependency coming soon
+    implementation files("lib/lambda-3.2-api.jar")

-    implementation('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+    implementation('org.spongepowered:mixin:0.8.5') {
        exclude module: 'commons-io'
        exclude module: 'gson'
        exclude module: 'guava'
@@ -87,51 +81,88 @@ dependencies {
    }

    // Hacky way to get mixin work
-    annotationProcessor('org.spongepowered:mixin:0.8.2:processor') {
+    annotationProcessor('org.spongepowered:mixin:0.8.5:processor') {
        exclude module: 'gson'
    }

    // Kotlin libs
    // kotlin-stdlib-common and annotations aren't required at runtime
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version") {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") {
        exclude module: 'kotlin-stdlib-common'
        exclude module: 'annotations'
    }

-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version") {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion") {
        exclude module: 'kotlin-stdlib-common'
        exclude module: 'annotations'
    }

-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version") {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") {
        exclude module: 'kotlin-stdlib-common'
        exclude module: 'annotations'
    }

-    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version") {
+    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") {
        exclude module: 'kotlin-stdlib-common'
        exclude module: 'annotations'
    }

-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version") {
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion") {
        exclude module: 'kotlin-stdlib-common'
        exclude module: 'annotations'
    }

    // Add them back to compileOnly (provided)
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlin_version"
-    compileOnly 'org.jetbrains:annotations:20.1.0'
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion"
+    compileOnly 'org.jetbrains:annotations:23.0.0'

    // This Baritone will NOT be included in the jar
    implementation 'com.github.cabaletta:baritone:1.2.14'

+    // Unit Testing frameworks
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+
    // Add your dependencies below
    // jarLibs 'com.lambda:example:1.0.0'
 }

 mixin {
    defaultObfuscationEnv 'searge'
-    add sourceSets.main, 'mixins.lambda.refmap.json'
+    add sourceSets.main, 'mixins.ExamplePlugin.refmap.json'
+}
+
+processResources {
+    exclude '**/rawimagefiles'
+
+    from(sourceSets.main.resources.srcDirs) {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        include 'plugin_info.json'
+        expand 'version': project.version
+    }
+}
+
+test {
+    useJUnitPlatform()
 }

 jar.finalizedBy('reobfJar')
+
+shadowJar {
+    archiveClassifier.set('')
+    configurations = []
+    relocate 'kotlin', 'com.lambda.shadow.kotlin'
+    relocate 'kotlinx', 'com.lambda.shadow.kotlinx'
+    finalizedBy 'reobfShadowJar'
+}
+
+reobf {
+    shadowJar {}
+    jar {
+        enabled = false
+    }
+}
+
+artifacts {
+    shadowJar
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,13 @@
 org.gradle.jvmargs=-Xmx3G
-modGroup=me.nepnep.bookbot
-modVersion=2.0.0
-kotlin_version=1.5.20
-kotlinx_coroutines_version=1.5.0-RC
-org.gradle.parallel=true
+org.gradle.parallel=true
+
+modGroup=com.lambda
+modVersion=1.1
+
+minecraftVersion=1.12.2
+forgeVersion=14.23.5.2860
+mappingsChannel=stable
+mappingsVersion=39-1.12
+
+kotlinVersion=1.7.10
+kotlinxCoroutinesVersion=1.6.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists