From ba87b8b1fa4e2397a3e0ed5a18f7ea6137d42f77 Mon Sep 17 00:00:00 2001 From: Wyvest <45589059+Wyvest@users.noreply.github.com> Date: Sat, 21 May 2022 17:50:43 +0700 Subject: vigilance compat (#15) * vigilance compat reorganize ASM * remove non-RenderManager nanovg usage wherever possible fix build generalize utils * setupGradle task * migrate to kotlin gradle use essential gradle toolkit shade new gson * Small changes * Update .gitignore * fix natives * Fix all problems * null Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com> --- build.gradle | 182 ----------------------------------------------------------- 1 file changed, 182 deletions(-) delete mode 100644 build.gradle (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 5342d39..0000000 --- a/build.gradle +++ /dev/null @@ -1,182 +0,0 @@ -//file:noinspection UnnecessaryQualifiedReference -//file:noinspection GroovyAssignabilityCheck -//file:noinspection GradlePackageUpdate -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -plugins { - id "dev.architectury.architectury-pack200" version "0.1.3" - id "com.github.johnrengelman.shadow" version "7.1.2" - id "cc.woverflow.loom" version "0.10.6" - id "net.kyori.blossom" version "1.3.0" - id "java" -} - -version = mod_version -group = "cc.polyfrost" -archivesBaseName = mod_name - -blossom { - String className = "src/main/java/cc/polyfrost/oneconfig/OneConfig.java" - replaceToken("@VER@", project.version, className) - replaceToken("@NAME@", mod_name, className) - replaceToken("@ID@", mod_id, className) -} - -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 -compileJava.options.encoding = 'UTF-8' - -loom { - launchConfigs { - client { - property("fml.coreMods.load", "cc.polyfrost.oneconfig.lwjgl.plugin.LoadingPlugin") - property("mixin.debug.export", "true") - } - } - runConfigs { - client { - ideConfigGenerated = true - } - } - forge { - pack200Provider = new dev.architectury.pack200.java.Pack200Adapter() - mixinConfig("mixins.oneconfig.json") - mixin.defaultRefmapName.set("mixins.oneconfig.refmap.json") - } -} - -configurations { - include - implementation.extendsFrom(include) - lwjgl - lwjglNative { - transitive = false - } -} - -sourceSets.main.runtimeClasspath += configurations.lwjglNative - -repositories { - maven { url 'https://repo.woverflow.cc/' } -} - -task lwjglJar(type: ShadowJar) { - group = "shadow" - archiveClassifier.set("lwjgl") - configurations = [project.configurations.lwjgl] - exclude "META-INF/versions/**" - exclude "**/module-info.class" - exclude "**/package-info.class" - relocate("org.lwjgl", "org.lwjgl3") { - include "org.lwjgl.PointerBuffer" - include "org.lwjgl.BufferUtils" - } -} - -dependencies { - minecraft("com.mojang:minecraft:1.8.9") - mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9") - forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") - - include("gg.essential:universalcraft-1.8.9-forge:209") { - transitive = false - } - - // for other mods and universalcraft - include("org.jetbrains.kotlin:kotlin-stdlib:1.6.21") - include("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21") - include("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21") - include("org.jetbrains.kotlin:kotlin-reflect:1.6.21") - include("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1") - include("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1") - include("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.1") - include("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.3.2") - include("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.3.2") - include("org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm:1.3.2") - - include("org.spongepowered:mixin:0.7.11-SNAPSHOT") { - transitive = false - } - - lwjgl "org.lwjgl:lwjgl:3.3.1" - lwjgl "org.lwjgl:lwjgl-stb:3.3.1" - lwjgl "org.lwjgl:lwjgl-tinyfd:3.3.1" - lwjgl "org.lwjgl:lwjgl-nanovg:3.3.1" - lwjglNative "org.lwjgl:lwjgl:3.3.1:natives-windows" - lwjglNative "org.lwjgl:lwjgl-stb:3.3.1:natives-windows" - lwjglNative "org.lwjgl:lwjgl-tinyfd:3.3.1:natives-windows" - lwjglNative "org.lwjgl:lwjgl-nanovg:3.3.1:natives-windows" - lwjglNative "org.lwjgl:lwjgl:3.3.1:natives-linux" - lwjglNative "org.lwjgl:lwjgl-stb:3.3.1:natives-linux" - lwjglNative "org.lwjgl:lwjgl-tinyfd:3.3.1:natives-linux" - lwjglNative "org.lwjgl:lwjgl-nanovg:3.3.1:natives-linux" - lwjglNative "org.lwjgl:lwjgl:3.3.1:natives-macos" - lwjglNative "org.lwjgl:lwjgl-stb:3.3.1:natives-macos" - lwjglNative "org.lwjgl:lwjgl-tinyfd:3.3.1:natives-macos" - lwjglNative "org.lwjgl:lwjgl-nanovg:3.3.1:natives-macos" - include lwjglJar.outputs.files -} - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", version - inputs.property "name", mod_name - inputs.property "id", mod_id - - filesMatching("mcmod.info") { - expand( - "id": mod_id, - "name": mod_name, - "version": version - ) - } - - rename '(.+_at.cfg)', 'META-INF/$1' -} - -sourceSets { - main { - output.resourcesDir = java.outputDir - } -} - -shadowJar { - archiveClassifier.set('dev') - configurations = [project.configurations.include, project.configurations.lwjglNative] - duplicatesStrategy DuplicatesStrategy.EXCLUDE - - relocate("gg.essential.universalcraft", "cc.polyfrost.oneconfig.libs.universalcraft") - exclude( - "**/LICENSE.md", - "**/LICENSE.txt", - "**/LICENSE", - "**/NOTICE", - "**/NOTICE.txt", - "pack.mcmeta", - "dummyThing", - "**/module-info.class", - "META-INF/proguard/**", - "META-INF/maven/**", - "META-INF/versions/**", - "META-INF/com.android.tools/**", - "fabric.mod.json" - ) -} - -remapJar { - archiveClassifier.set('') - from(shadowJar.archiveFile) -} - -jar { - manifest.attributes( - 'ModSide': 'CLIENT', - 'ForceLoadAsMod': true, - "TweakOrder": "0", - "MixinConfigs": "mixins.oneconfig.json", - "FMLCorePlugin": "cc.polyfrost.oneconfig.lwjgl.plugin.LoadingPlugin", - 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', - "FMLCorePluginContainsFMLMod": "lol" - ) - enabled = false -} -jar.dependsOn(shadowJar) -- cgit