From 4a9944f83798bba2d6ac31da02dea4a68d7742c7 Mon Sep 17 00:00:00 2001 From: LaoShui <3048087505@qq.com> Date: Thu, 18 Apr 2024 21:27:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 65 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 9d0851932..feb263c47 100644 --- a/build.gradle +++ b/build.gradle @@ -5,16 +5,19 @@ plugins { id "com.github.johnrengelman.shadow" version "6.1.0" id "net.minecraftforge.gradle.forge" id "org.spongepowered.mixin" - id "com.gorylenko.gradle-git-properties" version "2.4.0" + id "com.gorylenko.gradle-git-properties" version "2.4.1" } + repositories { mavenLocal() mavenCentral() + maven { url = "https://fdpclient.club/" } + maven { url = "https://maven.minecraftforge.net/" } maven { url = "https://repo.spongepowered.org/repository/maven-public/" } + maven { url = "https://repo.viaversion.com" } maven { url = "https://jitpack.io/" } - maven { url = "https://fdpclient.club/" } - maven { url = "https://lss233.littleservice.cn/repositories/minecraft/" } } + version = "5.0.0" group = "org.unlegitmc.fdp" archivesBaseName = "FDPClient" @@ -33,15 +36,23 @@ minecraft { runDir = "run" mappings = "stable_22" makeObfSourceJar = false - clientJvmArgs += ["-Dfml.coreMods.load=net.ccbluex.liquidbounce.injection.forge.TransformerLoader", "-Xmx1024m -Xms1024m", "-Ddev-mode"] + clientJvmArgs = ["-Dfml.coreMods.load=net.ccbluex.liquidbounce.injection.forge.TransformerLoader", "-Xmx2048m", "-Xms2048m", "-Ddev-mode"] } configurations { include implementation.extendsFrom(include) + + external + compile.extendsFrom(external) + + runtimeOnly.canBeResolved = true } dependencies { + + include 'org.projectlombok:lombok:1.18.32' + annotationProcessor 'org.projectlombok:lombok:1.18.32' include "com.google.zxing:core:3.5.0" include("org.spongepowered:mixin:0.7.11-SNAPSHOT") { transitive = false @@ -65,8 +76,12 @@ dependencies { exclude module: "kotlin-stdlib-jdk8" exclude module: "jna-platform" } - include("com.jagrosh:DiscordIPC:0.4") - include("com.github.CCBlueX:Elixir:1.2.4") { + include('com.jagrosh:DiscordIPC:0.4') { + exclude module: "gson" + exclude module: "log4j" + } + + include("com.github.CCBlueX:Elixir:1.2.6") { exclude module: "kotlin-stdlib" exclude module: "authlib" } @@ -90,16 +105,13 @@ dependencies { shadowJar { archiveClassifier.set("") configurations = [project.configurations.include] - duplicatesStrategy DuplicatesStrategy.EXCLUDE + duplicatesStrategy = DuplicatesStrategy.EXCLUDE - // Ultralight native files are going to be downloaded from our cloud + // Exclusions exclude "native-binaries/**" - exclude "LICENSE.txt" - exclude "META-INF/maven/**" exclude "META-INF/versions/**" - exclude "org/apache/**" exclude "org/junit/**" } @@ -115,10 +127,9 @@ processResources { rename "(.+_at.cfg)", "META-INF/\$1" } -task moveResources { +tasks.register('moveResources') { doLast { - ant.move file: "${buildDir}/resources/main", - todir: "${buildDir}/classes/java" + "${buildDir}/classes/java" } } @@ -134,7 +145,7 @@ jar { "ModSide": "CLIENT", "TweakClass": "org.spongepowered.asm.launch.MixinTweaker", "TweakOrder": "0", - "FMLAT": "fdpclient_at.cfg", + "FMLAT": "fdpclient_at.cfg" ) enabled = false @@ -152,4 +163,28 @@ reobf { } } +jar.dependsOn("shadowJar") + +configurations { + compileClasspath { + attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") + } + include { + attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") + } +} + +publishing { + publications { + maven(MavenPublication) { + groupId = group + artifactId = archivesBaseName + version = version + + from components.java + } + } +} + +tasks.reobfShadowJar.mustRunAfter shadowJar tasks.reobfJar.dependsOn(shadowJar) \ No newline at end of file From 9941cc89c4e22f51257e09e680803e5f913376a0 Mon Sep 17 00:00:00 2001 From: LaoShui <3048087505@qq.com> Date: Thu, 18 Apr 2024 21:30:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/build.gradle b/build.gradle index feb263c47..0dd818e31 100644 --- a/build.gradle +++ b/build.gradle @@ -163,28 +163,4 @@ reobf { } } -jar.dependsOn("shadowJar") - -configurations { - compileClasspath { - attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") - } - include { - attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") - } -} - -publishing { - publications { - maven(MavenPublication) { - groupId = group - artifactId = archivesBaseName - version = version - - from components.java - } - } -} - -tasks.reobfShadowJar.mustRunAfter shadowJar tasks.reobfJar.dependsOn(shadowJar) \ No newline at end of file From 4026a7933ab0a6b638bcb9d773f5e5afbcf6805e Mon Sep 17 00:00:00 2001 From: LaoShui <3048087505@qq.com> Date: Thu, 18 Apr 2024 21:37:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0dd818e31..31613b817 100644 --- a/build.gradle +++ b/build.gradle @@ -127,9 +127,10 @@ processResources { rename "(.+_at.cfg)", "META-INF/\$1" } -tasks.register('moveResources') { +task moveResources { doLast { - "${buildDir}/classes/java" + ant.move file: "${buildDir}/resources/main", + todir: "${buildDir}/classes/java" } } From 03fa2a231eb5437179697330c7b530d023d343f1 Mon Sep 17 00:00:00 2001 From: LaoShui <3048087505@qq.com> Date: Thu, 18 Apr 2024 22:12:56 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 50 +++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 31613b817..4d7564d5a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,10 @@ repositories { mavenLocal() mavenCentral() maven { url = "https://fdpclient.club/" } - maven { url = "https://maven.minecraftforge.net/" } maven { url = "https://repo.spongepowered.org/repository/maven-public/" } - maven { url = "https://repo.viaversion.com" } + maven { url = "https://lss233.littleservice.cn/repositories/minecraft/" } maven { url = "https://jitpack.io/" } + maven { url = "https://maven.minecraftforge.net/" } } version = "5.0.0" @@ -42,15 +42,9 @@ minecraft { configurations { include implementation.extendsFrom(include) - - external - compile.extendsFrom(external) - - runtimeOnly.canBeResolved = true } dependencies { - include 'org.projectlombok:lombok:1.18.32' annotationProcessor 'org.projectlombok:lombok:1.18.32' include "com.google.zxing:core:3.5.0" @@ -67,37 +61,27 @@ dependencies { annotationProcessor("org.spongepowered:mixin:0.7.11-SNAPSHOT") include "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - include("me.friwi:jcefmaven:$jcef_version") { - exclude module: "commons-compress" // minecraft have a old version of this library - exclude module: "jogl-all" // we use lwjgl - exclude module: "gluegen-rt" // this is the library for joal - } - include("com.github.UnlegitMinecraft:FuckPCL:2.0") { - exclude module: "kotlin-stdlib-jdk8" - exclude module: "jna-platform" - } - include('com.jagrosh:DiscordIPC:0.4') { - exclude module: "gson" - exclude module: "log4j" - } + + include "com.jagrosh:DiscordIPC:0.4" include("com.github.CCBlueX:Elixir:1.2.6") { exclude module: "kotlin-stdlib" exclude module: "authlib" } - include("com.github.zh79325:open-gif:1.0.4") { - exclude module: "slf4j-api" - exclude module: "logback-core" - exclude module: "logback-classic" - exclude module: "junit" - } // for read dynamic capes + include("com.github.UnlegitMinecraft:FuckPCL:2.0") { + exclude module: "kotlin-stdlib-jdk8" + exclude module: "jna-platform" + } include("com.github.UnlegitMinecraft:Astar3d:bec2291cf2") // pathfinding - // TheAltening include 'com.github.TheAltening:TheAltening4j:d0771f42d3' - include 'com.github.TheAltening:API-Java-AuthLib:-SNAPSHOT' + include 'com.github.TheAltening:API-Java-AuthLib:63a9702615' + + include "org.apache.httpcomponents:httpmime:4.5.14" + + include "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" include fileTree(include: ["*.jar"], dir: "libs") } @@ -105,14 +89,14 @@ dependencies { shadowJar { archiveClassifier.set("") configurations = [project.configurations.include] - duplicatesStrategy = DuplicatesStrategy.EXCLUDE + duplicatesStrategy DuplicatesStrategy.EXCLUDE // Exclusions - exclude "native-binaries/**" exclude "LICENSE.txt" exclude "META-INF/maven/**" exclude "META-INF/versions/**" - exclude "org/apache/**" + exclude "org/apache/log4j/**" + exclude "org/apache/commons/**" exclude "org/junit/**" } @@ -146,7 +130,7 @@ jar { "ModSide": "CLIENT", "TweakClass": "org.spongepowered.asm.launch.MixinTweaker", "TweakOrder": "0", - "FMLAT": "fdpclient_at.cfg" + "FMLAT": "fdpclient_at.cfg", ) enabled = false From 1fe3c8ad3ae5c8d31e0c5bad59d4cd7a9ee59ed7 Mon Sep 17 00:00:00 2001 From: LaoShui <3048087505@qq.com> Date: Thu, 18 Apr 2024 22:31:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index 4d7564d5a..6e73bec19 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,11 @@ minecraft { configurations { include implementation.extendsFrom(include) + + external + compile.extendsFrom(external) + + runtimeOnly.canBeResolved = true } dependencies { From 42071ed5aa883c8c1977bb074361d380f5142917 Mon Sep 17 00:00:00 2001 From: LaoShui <3048087505@qq.com> Date: Thu, 18 Apr 2024 22:38:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=BA=93=E7=89=88=E6=9C=AC=E5=8F=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 6e73bec19..4dfc15d3f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,14 +7,13 @@ plugins { id "org.spongepowered.mixin" id "com.gorylenko.gradle-git-properties" version "2.4.1" } - repositories { mavenLocal() mavenCentral() - maven { url = "https://fdpclient.club/" } maven { url = "https://repo.spongepowered.org/repository/maven-public/" } - maven { url = "https://lss233.littleservice.cn/repositories/minecraft/" } maven { url = "https://jitpack.io/" } + maven { url = "https://fdpclient.club/" } + maven { url = "https://lss233.littleservice.cn/repositories/minecraft/" } maven { url = "https://maven.minecraftforge.net/" } } @@ -42,16 +41,9 @@ minecraft { configurations { include implementation.extendsFrom(include) - - external - compile.extendsFrom(external) - - runtimeOnly.canBeResolved = true } dependencies { - include 'org.projectlombok:lombok:1.18.32' - annotationProcessor 'org.projectlombok:lombok:1.18.32' include "com.google.zxing:core:3.5.0" include("org.spongepowered:mixin:0.7.11-SNAPSHOT") { transitive = false @@ -66,27 +58,33 @@ dependencies { annotationProcessor("org.spongepowered:mixin:0.7.11-SNAPSHOT") include "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - - include "com.jagrosh:DiscordIPC:0.4" - - include("com.github.CCBlueX:Elixir:1.2.6") { - exclude module: "kotlin-stdlib" - exclude module: "authlib" + include("me.friwi:jcefmaven:$jcef_version") { + exclude module: "commons-compress" // minecraft have a old version of this library + exclude module: "jogl-all" // we use lwjgl + exclude module: "gluegen-rt" // this is the library for joal } - include("com.github.UnlegitMinecraft:FuckPCL:2.0") { exclude module: "kotlin-stdlib-jdk8" exclude module: "jna-platform" } + include("com.jagrosh:DiscordIPC:0.4") + include("com.github.CCBlueX:Elixir:1.2.4") { + exclude module: "kotlin-stdlib" + exclude module: "authlib" + } + + include("com.github.zh79325:open-gif:1.0.4") { + exclude module: "slf4j-api" + exclude module: "logback-core" + exclude module: "logback-classic" + exclude module: "junit" + } // for read dynamic capes include("com.github.UnlegitMinecraft:Astar3d:bec2291cf2") // pathfinding + // TheAltening include 'com.github.TheAltening:TheAltening4j:d0771f42d3' - include 'com.github.TheAltening:API-Java-AuthLib:63a9702615' - - include "org.apache.httpcomponents:httpmime:4.5.14" - - include "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + include 'com.github.TheAltening:API-Java-AuthLib:-SNAPSHOT' include fileTree(include: ["*.jar"], dir: "libs") } @@ -96,12 +94,15 @@ shadowJar { configurations = [project.configurations.include] duplicatesStrategy DuplicatesStrategy.EXCLUDE - // Exclusions + // Ultralight native files are going to be downloaded from our cloud + exclude "native-binaries/**" + exclude "LICENSE.txt" + exclude "META-INF/maven/**" exclude "META-INF/versions/**" - exclude "org/apache/log4j/**" - exclude "org/apache/commons/**" + + exclude "org/apache/**" exclude "org/junit/**" }