diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 78a1702..d67b7ef 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,42 +15,6 @@ repositories { dependencies { implementation("xyz.wagyourtail.unimined:xyz.wagyourtail.unimined.gradle.plugin:1.2.15-SNAPSHOT") - - // guava - implementation("com.google.guava:guava:31.1-jre") - - // gson - implementation("com.google.code.gson:gson:2.9.0") - - // asm - implementation("org.ow2.asm:asm:9.5") - implementation("org.ow2.asm:asm-commons:9.5") - implementation("org.ow2.asm:asm-tree:9.5") - implementation("org.ow2.asm:asm-analysis:9.5") - implementation("org.ow2.asm:asm-util:9.5") - - // remapper - implementation("net.fabricmc:tiny-remapper:0.8.7") { - exclude(group = "org.ow2.asm") - } - - // mappings - implementation("net.fabricmc:mapping-io:0.3.0") { - exclude(group = "org.ow2.asm") - } - - // jetbrains annotations - implementation("org.jetbrains:annotations-java5:23.0.0") - - // binpatcher - implementation("net.minecraftforge:binarypatcher:1.1.1") { - exclude(mapOf("group" to "commons-io")) - } - implementation("commons-io:commons-io:2.12.0") - - // pack200 provided by apache commons-compress - implementation("org.apache.commons:commons-compress:1.26.1") - - // aw - implementation("net.fabricmc:access-widener:2.1.0") + implementation("io.freefair.gradle:lombok-plugin:8.10.2") + implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0") } diff --git a/buildSrc/src/main/kotlin/dg-java-conventions.gradle.kts b/buildSrc/src/main/kotlin/dg-java-conventions.gradle.kts new file mode 100644 index 0000000..f97c004 --- /dev/null +++ b/buildSrc/src/main/kotlin/dg-java-conventions.gradle.kts @@ -0,0 +1,37 @@ +plugins { + idea + `java-library` + id("io.freefair.lombok") + id("com.diffplug.spotless") +} + +spotless { + java { + trimTrailingWhitespace() + indentWithSpaces(4) + endWithNewline() + + importOrder("", "javax|java", "\\#") + } +} + +afterEvaluate { + tasks.processResources { + filteringCharset = "UTF-8" + + filesMatching("fabric.mod.json") { + expand("version" to rootProject.version) + } + } +} + +tasks.withType { + options.encoding = "UTF-8" +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } +} + diff --git a/buildSrc/src/main/kotlin/dg-mc-conventions.gradle.kts b/buildSrc/src/main/kotlin/dg-mc-conventions.gradle.kts new file mode 100644 index 0000000..6fbba7c --- /dev/null +++ b/buildSrc/src/main/kotlin/dg-mc-conventions.gradle.kts @@ -0,0 +1,16 @@ +import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + +plugins { + id("dg-java-conventions") + id("xyz.wagyourtail.unimined") +} + +dependencies { + implementation(project(":common")) +} + +tasks.withType { + onlyIf { false } +} diff --git a/common/build.gradle b/common/build.gradle index 0a6b878..bf0bbec 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'java-library' + id 'dg-java-conventions' } dependencies { @@ -7,13 +7,3 @@ dependencies { implementation 'io.github.classgraph:classgraph:4.8.172' implementation "net.lenni0451:Reflect:1.3.3" } - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.10.2/build.gradle b/mc/1.10.2/build.gradle index 3018185..47d576c 100644 --- a/mc/1.10.2/build.gradle +++ b/mc/1.10.2/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.11.2/build.gradle b/mc/1.11.2/build.gradle index 2f4d191..3165370 100644 --- a/mc/1.11.2/build.gradle +++ b/mc/1.11.2/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.12.2/build.gradle b/mc/1.12.2/build.gradle index 39006d9..ef23b9d 100644 --- a/mc/1.12.2/build.gradle +++ b/mc/1.12.2/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.13/build.gradle b/mc/1.13/build.gradle index a9495b6..d5c3a70 100644 --- a/mc/1.13/build.gradle +++ b/mc/1.13/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.14/build.gradle b/mc/1.14/build.gradle index 41afe85..cd1df44 100644 --- a/mc/1.14/build.gradle +++ b/mc/1.14/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.15/build.gradle b/mc/1.15/build.gradle index ef9e21b..fcf6f54 100644 --- a/mc/1.15/build.gradle +++ b/mc/1.15/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.16/build.gradle b/mc/1.16/build.gradle index 97ff6b7..d2af1da 100644 --- a/mc/1.16/build.gradle +++ b/mc/1.16/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.17/build.gradle b/mc/1.17/build.gradle index 93162b7..c947ae5 100644 --- a/mc/1.17/build.gradle +++ b/mc/1.17/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.18/build.gradle b/mc/1.18/build.gradle index 66d0864..27b47a3 100644 --- a/mc/1.18/build.gradle +++ b/mc/1.18/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.19.2/build.gradle b/mc/1.19.2/build.gradle index 0a667b9..2b3acfd 100644 --- a/mc/1.19.2/build.gradle +++ b/mc/1.19.2/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.19/build.gradle b/mc/1.19/build.gradle index c2dfb2b..0481053 100644 --- a/mc/1.19/build.gradle +++ b/mc/1.19/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.20.4/build.gradle b/mc/1.20.4/build.gradle index 09c7a6d..7e6c3f1 100644 --- a/mc/1.20.4/build.gradle +++ b/mc/1.20.4/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.20.5/build.gradle b/mc/1.20.5/build.gradle index f2a5cf6..1db9ace 100644 --- a/mc/1.20.5/build.gradle +++ b/mc/1.20.5/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.20/build.gradle b/mc/1.20/build.gradle index 97a20b6..4659ddc 100644 --- a/mc/1.20/build.gradle +++ b/mc/1.20/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.21.3/build.gradle b/mc/1.21.3/build.gradle index 85b6813..d9d8ac6 100644 --- a/mc/1.21.3/build.gradle +++ b/mc/1.21.3/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,33 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/AttributesDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/AttributesDataGenerator.java index 8054ecd..033848c 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/AttributesDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/AttributesDataGenerator.java @@ -31,4 +31,4 @@ public class AttributesDataGenerator implements IDataGenerator { } return arr; } -} \ No newline at end of file +} diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java index 44f2f5e..d9a995f 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -7,11 +7,10 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.item.Item; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.registry.entry.RegistryEntryList; -import net.minecraft.util.Identifier; import net.minecraft.registry.entry.RegistryEntry; - +import net.minecraft.registry.entry.RegistryEntryList; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; import java.util.List; @@ -103,4 +102,4 @@ public class EnchantmentsDataGenerator implements IDataGenerator { .forEach(enchantment -> resultsArray.add(generateEnchantment(enchantmentRegistry, enchantment))); return resultsArray; } -} \ No newline at end of file +} diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java index 15c2194..d8d17e9 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java @@ -78,4 +78,4 @@ public class ItemsDataGenerator implements IDataGenerator { itemRegistry.stream().forEach(item -> resultArray.add(generateItem(itemRegistry, item))); return resultArray; } -} \ No newline at end of file +} diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 62eadf1..f3a994e 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -8,13 +8,13 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.client.color.block.BlockColors; -import net.minecraft.world.biome.FoliageColors; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.FoliageColors; import java.util.*; diff --git a/mc/1.21/build.gradle b/mc/1.21/build.gradle index a0abadb..83d20d0 100644 --- a/mc/1.21/build.gradle +++ b/mc/1.21/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,33 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java index 177b199..c139b7a 100644 --- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -7,12 +7,11 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.item.Item; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.entry.RegistryEntryList; import net.minecraft.registry.tag.EnchantmentTags; import net.minecraft.registry.tag.TagKey; -import net.minecraft.registry.entry.RegistryEntryList; import net.minecraft.util.Identifier; -import net.minecraft.registry.entry.RegistryEntry; - import java.util.List; @@ -95,5 +94,5 @@ public class EnchantmentsDataGenerator implements IDataGenerator { return resultsArray; } - + } diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java index 63dc30b..e713bb1 100644 --- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java +++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java @@ -26,7 +26,7 @@ public class ItemsDataGenerator implements IDataGenerator { .collect(Collectors.toList()); } - + public static JsonObject generateItem(Registry itemRegistry, Item item) { JsonObject itemDesc = new JsonObject(); diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 3773db5..c16e9d4 100644 --- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -8,13 +8,13 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.client.color.block.BlockColors; -import net.minecraft.world.biome.FoliageColors; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.FoliageColors; import java.util.*; diff --git a/mc/1.7/build.gradle b/mc/1.7/build.gradle index 3b64497..2cc60c0 100644 --- a/mc/1.7/build.gradle +++ b/mc/1.7/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.8.9/build.gradle b/mc/1.8.9/build.gradle index 3675007..d6168af 100644 --- a/mc/1.8.9/build.gradle +++ b/mc/1.8.9/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java index 5ca2575..24c8c02 100644 --- a/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java +++ b/mc/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -25,4 +25,4 @@ public class InstrumentsDataGenerator implements IDataGenerator { } return array; } -} \ No newline at end of file +} diff --git a/mc/1.9.4/build.gradle b/mc/1.9.4/build.gradle index d32f942..fc9e652 100644 --- a/mc/1.9.4/build.gradle +++ b/mc/1.9.4/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -} diff --git a/mc/22w19a/build.gradle b/mc/22w19a/build.gradle index a3a1f9d..ad43ccb 100644 --- a/mc/22w19a/build.gradle +++ b/mc/22w19a/build.gradle @@ -1,8 +1,7 @@ -import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider plugins { - id 'xyz.wagyourtail.unimined' + id 'dg-mc-conventions' } unimined.minecraft { @@ -15,39 +14,13 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - runs.config("server") { - javaVersion = JavaVersion.VERSION_21 - } - customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { it.loader libs.versions.fabric.loader.get() } + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + defaultRemapJar = true } - -dependencies { - implementation project(":common") -} - -processResources { - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(RemapJarTask).configureEach { - onlyIf { false} -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" -} - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) - } -}