diff --git a/addon.gradle b/addon.gradle new file mode 100644 index 0000000..17e2283 --- /dev/null +++ b/addon.gradle @@ -0,0 +1,7 @@ +apply plugin: 'org.jetbrains.kotlin.jvm' + +compileKotlin { + kotlinOptions { + jvmTarget = 1.8 + } +} diff --git a/build.gradle b/build.gradle index 5073008..3493910 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1656760732 +//version: 1655755555 /* DO NOT CHANGE THIS FILE! @@ -57,7 +57,6 @@ plugins { id 'com.palantir.git-version' version '0.13.0' apply false id 'de.undercouch.download' version '5.0.1' id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false - id "com.diffplug.spotless" version "6.7.2" } if (project.file('.git/HEAD').isFile()) { @@ -84,37 +83,6 @@ idea { } } -// Spotless autoformatter -// See https://github.com/diffplug/spotless/tree/main/plugin-gradle -// Can be locally toggled via spotless:off/spotless:on comments -spotless { - encoding 'UTF-8' - - format 'misc', { - target '.gitignore' - - trimTrailingWhitespace() - indentWithSpaces(4) - endWithNewline() - } - java { - toggleOffOn() - importOrder() - removeUnusedImports() - palantirJavaFormat('1.1.0') // last version supporting jvm 8 - } - kotlin { - toggleOffOn() - ktfmt('0.39') - } - groovyGradle { - toggleOffOn() - importOrder() - target '*.gradle' - greclipse('4.19.0') // last version supporting jvm 8 - } -} - if(JavaVersion.current() != JavaVersion.VERSION_1_8) { throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current()) } @@ -142,7 +110,6 @@ checkPropertyExists("developmentEnvironmentUserName") boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean() -boolean forceEnableMixins = project.findProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false String channel = project.findProperty('channel') ? project.channel : 'stable' String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12' String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' @@ -229,9 +196,9 @@ try { } catch (Exception ignored) { out.style(Style.Failure).text( - 'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' + - 'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' + - 'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)' + 'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' + + 'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' + + 'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)' ) versionOverride = 'NO-GIT-TAG-SET' identifiedVersion = versionOverride @@ -256,15 +223,15 @@ else { def arguments = [] def jvmArguments = [] -if (usesMixins.toBoolean() || forceEnableMixins) { +if (usesMixins.toBoolean()) { arguments += [ - "--tweakClass org.spongepowered.asm.launch.MixinTweaker" + "--tweakClass org.spongepowered.asm.launch.MixinTweaker" ] if (usesMixinDebug.toBoolean()) { jvmArguments += [ - "-Dmixin.debug.countInjections=true", - "-Dmixin.debug.verbose=true", - "-Dmixin.debug.export=true" + "-Dmixin.debug.countInjections=true", + "-Dmixin.debug.verbose=true", + "-Dmixin.debug.export=true" ] } } @@ -321,7 +288,7 @@ repositories { name 'Overmind forge repo mirror' url 'https://gregtech.overminddl1.com/' } - if(usesMixins.toBoolean() || forceEnableMixins) { + if(usesMixins.toBoolean()) { maven { name 'sponge' url 'https://repo.spongepowered.org/repository/maven-public' @@ -338,8 +305,6 @@ dependencies { annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT') - } - if(usesMixins.toBoolean() || forceEnableMixins) { // using 0.8 to workaround a issue in 0.7 which fails mixin application compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') { // Mixin includes a lot of dependencies that are too up-to-date @@ -475,9 +440,9 @@ processResources { // replace modVersion and minecraftVersion expand "minecraftVersion": project.minecraft.version, - "modVersion": modVersion, - "modId": modId, - "modName": modName + "modVersion": modVersion, + "modId": modId, + "modName": modName } if(usesMixins.toBoolean()) { @@ -778,27 +743,27 @@ static unzip(String zipFileName, String outputDir) { ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName)) ZipEntry zipEntry = zis.getNextEntry() while (zipEntry != null) { - File newFile = new File(outputDir + File.separator, zipEntry.name) - if (zipEntry.isDirectory()) { - if (!newFile.isDirectory() && !newFile.mkdirs()) { - throw new IOException("Failed to create directory $newFile") - } - } else { - // fix for Windows-created archives - File parent = newFile.parentFile - if (!parent.isDirectory() && !parent.mkdirs()) { - throw new IOException("Failed to create directory $parent") - } - // write file content - FileOutputStream fos = new FileOutputStream(newFile) - int len = 0 - while ((len = zis.read(buffer)) > 0) { - fos.write(buffer, 0, len) - } - fos.close() - } - zipEntry = zis.getNextEntry() - } + File newFile = new File(outputDir + File.separator, zipEntry.name) + if (zipEntry.isDirectory()) { + if (!newFile.isDirectory() && !newFile.mkdirs()) { + throw new IOException("Failed to create directory $newFile") + } + } else { + // fix for Windows-created archives + File parent = newFile.parentFile + if (!parent.isDirectory() && !parent.mkdirs()) { + throw new IOException("Failed to create directory $parent") + } + // write file content + FileOutputStream fos = new FileOutputStream(newFile) + int len = 0 + while ((len = zis.read(buffer)) > 0) { + fos.write(buffer, 0, len) + } + fos.close() + } + zipEntry = zis.getNextEntry() + } zis.closeEntry() zis.close() } diff --git a/dependencies.gradle b/dependencies.gradle index 97b5824..1aed663 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,11 +1,11 @@ // Add your dependencies here dependencies { - - shadowCompile 'org.jetbrains.kotlin:kotlin-stdlib' - shadowCompile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' - shadowCompile 'org.jetbrains.kotlin:kotlin-reflect' - shadowCompile 'org.jetbrains:annotations' - shadowCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0' - shadowCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0' + shadeCompile("org.jetbrains.kotlin:kotlin-stdlib") + shadeCompile("org.jetbrains.kotlin:kotlin-stdlib-jdk7") + shadeCompile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + shadeCompile("org.jetbrains.kotlin:kotlin-reflect") + shadeCompile("org.jetbrains:annotations") + shadeCompile("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") + shadeCompile("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0") } diff --git a/gradle.properties b/gradle.properties index 7cb48d4..f5296bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,12 +64,9 @@ coreModClass = # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! containsMixinsAndOrCoreModOnly = false -# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. -forceEnableMixins = false - # If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. -usesShadowedDependencies = false +usesShadowedDependencies = true # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older # projects. New projects should not use this parameter.