diff options
| -rwxr-xr-x | .gitignore | 1 | ||||
| -rw-r--r-- | .vscode/launch.json | 31 | ||||
| -rwxr-xr-x | build.gradle | 138 | ||||
| -rw-r--r-- | gradle.properties | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | gradle/wrapper/gradle-wrapper.jar | bin | 54417 -> 59821 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | settings.gradle | 21 | ||||
| -rwxr-xr-x | src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java | 2 |
8 files changed, 128 insertions, 70 deletions
@@ -9,6 +9,7 @@ logs/* config/* crash-reports/* run/* +jars/* screenshots/* DEBUG/* sdk/* diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..0416469e --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,31 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Minecraft Client", + "request": "launch", + "cwd": "${workspaceFolder}/run", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "\"-Dfabric.dli.config\u003d/home/syeyoung/Documents/dungeonsguide/3.0/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"", + "args": "", + "env": {}, + "projectName": "" + }, + { + "type": "java", + "name": "Minecraft Server", + "request": "launch", + "cwd": "${workspaceFolder}/run", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "\"-Dfabric.dli.config\u003d/home/syeyoung/Documents/dungeonsguide/3.0/.gradle/loom-cache/launch.cfg\" \"-Dfabric.dli.env\u003dserver\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"", + "args": "\"nogui\"", + "env": {}, + "projectName": "" + } + ] +}
\ No newline at end of file diff --git a/build.gradle b/build.gradle index f5a232e1..f108ac58 100755 --- a/build.gradle +++ b/build.gradle @@ -1,77 +1,97 @@ -/* - * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod - * Copyright (C) 2021 cyoung06 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ - -buildscript { - repositories { - gradlePluginPortal() - mavenCentral() - maven { - name = "forge" - url = "https://maven.minecraftforge.net/" - } - maven { url "https://jitpack.io" } - } - dependencies { - classpath "com.github.kingstefan26:ForgeGradle:4907a75a" - classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0" - } + +plugins { + id "idea" + id "java" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "dev.architectury.architectury-pack200" version "0.1.3" + id "gg.essential.loom" version "0.10.0.+" } -apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: "com.github.johnrengelman.shadow" -version = "3.0" +tasks.wrapper { + gradleVersion = "7.4" + // You can either download the binary-only version of Gradle (BIN) or + // the full version (with sources and documentation) of Gradle (ALL) + distributionType = Wrapper.DistributionType.ALL +} +version = "3.0.0" group = "kr.syeyoung.dungeonsguide" archivesBaseName = "dungeonsguide" -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +loom { + launchConfigs { + client { + } + } + runs { + "client" { + property('devauth.enabled','true') + client() + } + } + forge { + pack200Provider.set(new dev.architectury.pack200.java.Pack200Adapter()) + } } -minecraft { - version = "1.8.9-11.15.1.2318-1.8.9" - runDir = "run" - mappings = "stable_22" - makeObfSourceJar = false +sourceSets.main { + output.setResourcesDir(file("$buildDir/classes/java/main")) } + repositories { mavenCentral() maven { url "https://jitpack.io" } + maven {url "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1"} +} + +configurations { + implementation.extendsFrom shadowImpl } + + 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") + + implementation "org.jetbrains:annotations-java5:19.0.0" implementation "org.java-websocket:Java-WebSocket:1.5.1" implementation "org.json:json:20171018" implementation "com.twelvemonkeys.imageio:imageio-bmp:3.7.0" - compileOnly "org.projectlombok:lombok:1.18.20" - compileOnly files("mods/Hychat-1.12.1-BETA.jar") + compileOnly files("jars/Hychat-1.12.1-BETA.jar") annotationProcessor "org.projectlombok:lombok:1.18.16" testCompileOnly "org.projectlombok:lombok:1.18.20" testAnnotationProcessor "org.projectlombok:lombok:1.18.20" + modRuntimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.0") +} + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +tasks.withType(Jar) { + archivesBaseName = "dungeonsguide" + manifest { + attributes["FMLCorePluginContainsFMLMod"] = "true" + attributes["ForceLoadAsMod"] = "true" + + // If you don't want mixins, remove these lines +// this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" +// this["MixinConfigs"] = "mixins.examplemod.json" + } } -shadowJar { + +tasks.shadowJar { archiveFileName = jar.archiveFileName @@ -85,27 +105,11 @@ shadowJar { } } -reobf { - shadowJar { - mappingType = "SEARGE" - } +tasks.named("remapJar") { + archiveClassifier = "all" + from(tasks.shadowJar) + input = tasks.shadowJar.archiveFile } -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include "mcmod.info" - - // replace version and mcversion - expand "version": project.version, "mcversion": project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } -}
\ No newline at end of file +tasks.assemble.dependsOn tasks.remapJar diff --git a/gradle.properties b/gradle.properties index bf86fb71..6c41dec1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -org.gradle.jvmargs=-Xmx2G
\ No newline at end of file +org.gradle.jvmargs=-Xmx2G +loom.platform=forge
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 758de960..41d9927a 100755..100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cf6eb5a..b1159fc5 100755..100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..a846bc9c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,21 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven{ url "https://oss.sonatype.org/content/repositories/snapshots"} + maven{ url "https://maven.architectury.dev/"} + maven{ url "https://maven.fabricmc.net"} + maven{ url "https://maven.minecraftforge.net/"} + maven{ url "https://repo.spongepowered.org/maven/"} + maven{ url "https://repo.sk1er.club/repository/maven-releases/"} + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "gg.essential.loom") { + useModule("gg.essential:architectury-loom:${requested.version}") + } + } + } +} + +rootProject.name = "Dungeons Guide"
\ No newline at end of file diff --git a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java index b3467132..f1c8b3a9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/DungeonsGuide.java @@ -254,7 +254,7 @@ public class DungeonsGuide implements DGInterface, CloseListener { } @Override - protected void actionPerformed(GuiButton button) throws IOException { + protected void actionPerformed(GuiButton button) { FMLCommonHandler.instance().exitJava(-1, true); } }; |