From aa35a1190c6c806f491a1535f70f0d219a74fde8 Mon Sep 17 00:00:00 2001 From: baka4n Date: Fri, 12 Jan 2024 16:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=83=E7=94=A8=E5=A4=9A=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=96=B9=E4=BE=BF=E5=AE=9E=E7=8E=B0jitpack?= =?UTF-8?q?=E8=AF=BB=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 130 +++++++++++++++++- core/build.gradle | 127 ----------------- settings.gradle | 4 +- .../java/io/github/xenfork/acl/MainAware.java | 0 .../java/io/github/xenfork/acl/TagTask.java | 0 .../io/github/xenfork/acl/mappings/Mcp.java | 0 .../github/xenfork/acl/mappings/Mojang.java | 0 .../io/github/xenfork/acl/mappings/Type.java | 0 .../io/github/xenfork/acl/mappings/Yarn.java | 0 .../xenfork/acl/projects/AclExtensions.java | 0 .../xenfork/acl/projects/AllProjects.java | 0 .../io/github/xenfork/acl/projects/Main.java | 0 .../xenfork/acl/projects/SubProjects.java | 0 .../xenfork/acl/projects/sub/Basic.java | 0 .../xenfork/acl/projects/sub/Common.java | 0 .../xenfork/acl/projects/sub/Fabric.java | 0 .../xenfork/acl/projects/sub/Forge.java | 0 .../xenfork/acl/projects/sub/NeoForge.java | 0 .../xenfork/acl/projects/sub/Quilt.java | 0 .../xenfork/acl/settings/MainSettings.java | 0 .../xenfork/acl/settings/StsExtensions.java | 0 .../github/xenfork/acl/tasks/FabricTask.java | 0 .../github/xenfork/acl/tasks/ForgeTask.java | 0 23 files changed, 128 insertions(+), 133 deletions(-) delete mode 100644 core/build.gradle rename {core/src => src}/main/java/io/github/xenfork/acl/MainAware.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/TagTask.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/mappings/Mcp.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/mappings/Mojang.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/mappings/Type.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/mappings/Yarn.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/AclExtensions.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/AllProjects.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/Main.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/SubProjects.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/sub/Basic.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/sub/Common.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/sub/Fabric.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/sub/Forge.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/sub/NeoForge.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/projects/sub/Quilt.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/settings/MainSettings.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/settings/StsExtensions.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/tasks/FabricTask.java (100%) rename {core/src => src}/main/java/io/github/xenfork/acl/tasks/ForgeTask.java (100%) diff --git a/build.gradle b/build.gradle index fbca5eb..a7f5d82 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,132 @@ + plugins { - id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false - id "com.github.johnrengelman.shadow" version "8.1.1" apply false -// id "acl" version "$acl_test_version" + id 'groovy' + id 'java-gradle-plugin' + id 'java' + id 'idea' + id 'eclipse' + id "org.jetbrains.kotlin.jvm" version "1.9.21" + id 'maven-publish' +} + +group = 'io.github.xenfork' +version = "$acl_version" + +repositories { + google() + jcenter() + mavenCentral() + mavenLocal() + gradlePluginPortal() + maven { url "https://maven.fabricmc.net/" } + maven { url "https://maven.architectury.dev/" } + maven { url "https://maven.minecraftforge.net/" } +} + +dependencies { + implementation(gradleApi()) + implementation(localGroovy()) + implementation("dev.architectury:architectury-loom:1.4-SNAPSHOT") + implementation('commons-io:commons-io:2.15.0') +// implementation('com.google.code.gson:gson:2.10.1') +// implementation('com.fasterxml.jackson.core:jackson-databind:2.15.2') + implementation('com.google.guava:guava:32.1.3-jre') + implementation('cn.hutool:hutool-all:5.8.24') +// implementation('org.ow2.asm:asm:9.6') +// implementation('org.ow2.asm:asm-analysis:9.6') +// implementation('org.ow2.asm:asm-commons:9.6') +// implementation('org.ow2.asm:asm-tree:9.6') +// implementation('org.ow2.asm:asm-util:9.6') +// implementation('net.fabricmc:stitch:0.6.2') { +// exclude module:"enigma" +// exclude module:"mercury" +// } +// implementation('dev.architectury:tiny-remapper:1.10.24') +// implementation('net.fabricmc:access-widener:2.1.0') +// implementation('net.fabricmc:mapping-io:0.4.2') +// implementation('net.fabricmc:lorenz-tiny:4.0.2') { transitive false } +// implementation('dev.architectury:refmap-remapper:1.0.5') +// implementation('dev.architectury:mercury:0.1.2.15') +// implementation('org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0') { transitive false } +// implementation('net.minecraftforge:installertools:1.2.0') +// implementation('org.cadixdev:lorenz:0.5.3') +// implementation('de.oceanlabs.mcp:mcinjector:3.8.0') +// //noinspection VulnerableLibrariesLocal +// implementation('com.opencsv:opencsv:5.9') +// implementation('net.minecraftforge:DiffPatch:2.0.7') +// implementation('com.mojang:datafixerupper:6.0.8') +// implementation('dev.architectury:at:1.0.1') +// implementation('com.electronwill.night-config:toml:3.6.6') +// +// implementation("me.shedaniel:forgified-fabric-loom:0.5.16") + implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21') + implementation("architectury-plugin:architectury-plugin.gradle.plugin:3.4-SNAPSHOT") + + implementation("com.github.johnrengelman:shadow:8.1.1") +// implementation 'org.ow2.asm:asm:9.6' +// implementation 'org.ow2.asm:asm-commons:9.6' +// implementation 'org.ow2.asm:asm-analysis:9.6' +// implementation 'org.ow2.asm:asm-util:9.6' +// implementation 'org.ow2.asm:asm-tree:9.6' +// implementation('com.android.tools.build:gradle:8.1.3') { +// exclude group:'org.ow2.asm' +// } +} + +//using ★ and ☆ +gradlePlugin { + + plugins { + create("pre-acl") { + id = "pre-acl" + implementationClass = "io.github.xenfork.acl.settings.MainSettings" + }// ☆ to step build-acl + create("build-acl") { + id = "build-acl" + implementationClass = "io.github.xenfork.acl.projects.Main" + }// ☆ + create("acl") { + id = "acl" + implementationClass = "io.github.xenfork.acl.MainAware" + }// ★★★★★★ + } +} + + + +jar { + enabled = true + zip64 = true } +task sourcesJar(type: Jar, dependsOn: classes) { + archiveClassifier.set("sources") + + from sourceSets.main.allSource +} + +java { + withSourcesJar() +} + +publishing { + repositories { + mavenLocal() + maven { + url rootProject.file("rootmaven") + } + } + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.name + version project.version + from components.java + } + } +} + + allprojects { repositories { maven { diff --git a/core/build.gradle b/core/build.gradle deleted file mode 100644 index 7c0e617..0000000 --- a/core/build.gradle +++ /dev/null @@ -1,127 +0,0 @@ - -plugins { - id 'groovy' - id 'java-gradle-plugin' - id 'java' - id 'idea' - id 'eclipse' - id "org.jetbrains.kotlin.jvm" version "1.9.21" - id 'maven-publish' -} - -group = 'io.github.xenfork' -version = "$acl_version" - -repositories { - google() - jcenter() - mavenCentral() - mavenLocal() - gradlePluginPortal() - maven { url "https://maven.fabricmc.net/" } - maven { url "https://maven.architectury.dev/" } - maven { url "https://maven.minecraftforge.net/" } -} - -dependencies { - implementation(gradleApi()) - implementation(localGroovy()) - implementation("dev.architectury:architectury-loom:1.4-SNAPSHOT") - implementation('commons-io:commons-io:2.15.0') -// implementation('com.google.code.gson:gson:2.10.1') -// implementation('com.fasterxml.jackson.core:jackson-databind:2.15.2') - implementation('com.google.guava:guava:32.1.3-jre') - implementation('cn.hutool:hutool-all:5.8.24') -// implementation('org.ow2.asm:asm:9.6') -// implementation('org.ow2.asm:asm-analysis:9.6') -// implementation('org.ow2.asm:asm-commons:9.6') -// implementation('org.ow2.asm:asm-tree:9.6') -// implementation('org.ow2.asm:asm-util:9.6') -// implementation('net.fabricmc:stitch:0.6.2') { -// exclude module:"enigma" -// exclude module:"mercury" -// } -// implementation('dev.architectury:tiny-remapper:1.10.24') -// implementation('net.fabricmc:access-widener:2.1.0') -// implementation('net.fabricmc:mapping-io:0.4.2') -// implementation('net.fabricmc:lorenz-tiny:4.0.2') { transitive false } -// implementation('dev.architectury:refmap-remapper:1.0.5') -// implementation('dev.architectury:mercury:0.1.2.15') -// implementation('org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0') { transitive false } -// implementation('net.minecraftforge:installertools:1.2.0') -// implementation('org.cadixdev:lorenz:0.5.3') -// implementation('de.oceanlabs.mcp:mcinjector:3.8.0') -// //noinspection VulnerableLibrariesLocal -// implementation('com.opencsv:opencsv:5.9') -// implementation('net.minecraftforge:DiffPatch:2.0.7') -// implementation('com.mojang:datafixerupper:6.0.8') -// implementation('dev.architectury:at:1.0.1') -// implementation('com.electronwill.night-config:toml:3.6.6') -// -// implementation("me.shedaniel:forgified-fabric-loom:0.5.16") - implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21') - implementation("architectury-plugin:architectury-plugin.gradle.plugin:3.4-SNAPSHOT") - - implementation("com.github.johnrengelman:shadow:8.1.1") -// implementation 'org.ow2.asm:asm:9.6' -// implementation 'org.ow2.asm:asm-commons:9.6' -// implementation 'org.ow2.asm:asm-analysis:9.6' -// implementation 'org.ow2.asm:asm-util:9.6' -// implementation 'org.ow2.asm:asm-tree:9.6' -// implementation('com.android.tools.build:gradle:8.1.3') { -// exclude group:'org.ow2.asm' -// } -} - -//using ★ and ☆ -gradlePlugin { - - plugins { - create("pre-acl") { - id = "pre-acl" - implementationClass = "io.github.xenfork.acl.settings.MainSettings" - }// ☆ to step build-acl - create("build-acl") { - id = "build-acl" - implementationClass = "io.github.xenfork.acl.projects.Main" - }// ☆ - create("acl") { - id = "acl" - implementationClass = "io.github.xenfork.acl.MainAware" - }// ★★★★★★ - } -} - - - -jar { - enabled = true - zip64 = true -} - -task sourcesJar(type: Jar, dependsOn: classes) { - archiveClassifier.set("sources") - - from sourceSets.main.allSource -} - -java { - withSourcesJar() -} - -publishing { - repositories { - mavenLocal() - maven { - url rootProject.file("rootmaven") - } - } - publications { - mavenJava(MavenPublication) { - groupId project.group - artifactId project.name - version project.version - from components.java - } - } -} diff --git a/settings.gradle b/settings.gradle index 852d14e..4d9dfc9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,6 @@ pluginManagement { rootProject.name = 'acl' -include("core") -project(":core").name="acl-core" +//include("core") +//project(":core").name="acl-core" diff --git a/core/src/main/java/io/github/xenfork/acl/MainAware.java b/src/main/java/io/github/xenfork/acl/MainAware.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/MainAware.java rename to src/main/java/io/github/xenfork/acl/MainAware.java diff --git a/core/src/main/java/io/github/xenfork/acl/TagTask.java b/src/main/java/io/github/xenfork/acl/TagTask.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/TagTask.java rename to src/main/java/io/github/xenfork/acl/TagTask.java diff --git a/core/src/main/java/io/github/xenfork/acl/mappings/Mcp.java b/src/main/java/io/github/xenfork/acl/mappings/Mcp.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/mappings/Mcp.java rename to src/main/java/io/github/xenfork/acl/mappings/Mcp.java diff --git a/core/src/main/java/io/github/xenfork/acl/mappings/Mojang.java b/src/main/java/io/github/xenfork/acl/mappings/Mojang.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/mappings/Mojang.java rename to src/main/java/io/github/xenfork/acl/mappings/Mojang.java diff --git a/core/src/main/java/io/github/xenfork/acl/mappings/Type.java b/src/main/java/io/github/xenfork/acl/mappings/Type.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/mappings/Type.java rename to src/main/java/io/github/xenfork/acl/mappings/Type.java diff --git a/core/src/main/java/io/github/xenfork/acl/mappings/Yarn.java b/src/main/java/io/github/xenfork/acl/mappings/Yarn.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/mappings/Yarn.java rename to src/main/java/io/github/xenfork/acl/mappings/Yarn.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/AclExtensions.java b/src/main/java/io/github/xenfork/acl/projects/AclExtensions.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/AclExtensions.java rename to src/main/java/io/github/xenfork/acl/projects/AclExtensions.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/AllProjects.java b/src/main/java/io/github/xenfork/acl/projects/AllProjects.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/AllProjects.java rename to src/main/java/io/github/xenfork/acl/projects/AllProjects.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/Main.java b/src/main/java/io/github/xenfork/acl/projects/Main.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/Main.java rename to src/main/java/io/github/xenfork/acl/projects/Main.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/SubProjects.java b/src/main/java/io/github/xenfork/acl/projects/SubProjects.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/SubProjects.java rename to src/main/java/io/github/xenfork/acl/projects/SubProjects.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/sub/Basic.java b/src/main/java/io/github/xenfork/acl/projects/sub/Basic.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/sub/Basic.java rename to src/main/java/io/github/xenfork/acl/projects/sub/Basic.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/sub/Common.java b/src/main/java/io/github/xenfork/acl/projects/sub/Common.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/sub/Common.java rename to src/main/java/io/github/xenfork/acl/projects/sub/Common.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/sub/Fabric.java b/src/main/java/io/github/xenfork/acl/projects/sub/Fabric.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/sub/Fabric.java rename to src/main/java/io/github/xenfork/acl/projects/sub/Fabric.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/sub/Forge.java b/src/main/java/io/github/xenfork/acl/projects/sub/Forge.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/sub/Forge.java rename to src/main/java/io/github/xenfork/acl/projects/sub/Forge.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/sub/NeoForge.java b/src/main/java/io/github/xenfork/acl/projects/sub/NeoForge.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/sub/NeoForge.java rename to src/main/java/io/github/xenfork/acl/projects/sub/NeoForge.java diff --git a/core/src/main/java/io/github/xenfork/acl/projects/sub/Quilt.java b/src/main/java/io/github/xenfork/acl/projects/sub/Quilt.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/projects/sub/Quilt.java rename to src/main/java/io/github/xenfork/acl/projects/sub/Quilt.java diff --git a/core/src/main/java/io/github/xenfork/acl/settings/MainSettings.java b/src/main/java/io/github/xenfork/acl/settings/MainSettings.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/settings/MainSettings.java rename to src/main/java/io/github/xenfork/acl/settings/MainSettings.java diff --git a/core/src/main/java/io/github/xenfork/acl/settings/StsExtensions.java b/src/main/java/io/github/xenfork/acl/settings/StsExtensions.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/settings/StsExtensions.java rename to src/main/java/io/github/xenfork/acl/settings/StsExtensions.java diff --git a/core/src/main/java/io/github/xenfork/acl/tasks/FabricTask.java b/src/main/java/io/github/xenfork/acl/tasks/FabricTask.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/tasks/FabricTask.java rename to src/main/java/io/github/xenfork/acl/tasks/FabricTask.java diff --git a/core/src/main/java/io/github/xenfork/acl/tasks/ForgeTask.java b/src/main/java/io/github/xenfork/acl/tasks/ForgeTask.java similarity index 100% rename from core/src/main/java/io/github/xenfork/acl/tasks/ForgeTask.java rename to src/main/java/io/github/xenfork/acl/tasks/ForgeTask.java