From 5b830a7ce044f82e644bd77671e8920390c57bc4 Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Thu, 13 Jul 2023 22:36:16 +0200 Subject: [PATCH] [CHORE] Update to FDD Multi-Loader template and update maven url --- Common/build.gradle | 24 +++++++++--------------- Fabric/build.gradle | 2 +- Forge/build.gradle | 2 +- build.gradle | 2 +- settings.gradle | 8 ++++++++ 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Common/build.gradle b/Common/build.gradle index dc2d599..728fb46 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -1,29 +1,23 @@ plugins { id 'java' - id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' + id 'org.quiltmc.loom' version '0.12.+' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.0.0' } archivesBaseName = "${mod_name}-common-${minecraft_version}" -minecraft { - accessWideners(project.file("src/main/resources/craterlib.aw")) - version(minecraft_version) - runs { - if (project.hasProperty('common_runs_enabled') ? project.findProperty('common_runs_enabled').toBoolean() : true) { - - server(project.hasProperty('common_server_run_name') ? project.findProperty('common_server_run_name') : 'vanilla_server') { - workingDirectory(this.file("run")) - } - client(project.hasProperty('common_client_run_name') ? project.findProperty('common_client_run_name') : 'vanilla_client') { - workingDirectory(this.file("run")) - } - } +loom { + accessWidenerPath = project.file("src/main/resources/craterlib.aw") + remapArchives = false + mixin { + useLegacyMixinAp = false } } dependencies { + minecraft "com.mojang:minecraft:${minecraft_version}" + mappings loom.officialMojangMappings() compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5' } @@ -70,7 +64,7 @@ publishing { repositories { maven { - url "https://maven.firstdarkdev.xyz/" + (project.release ? "releases" : "snapshots") + url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots") credentials { username System.getenv("MAVEN_USER") password System.getenv("MAVEN_PASS") diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 4b2aef2..0eef14d 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -109,7 +109,7 @@ publishing { repositories { maven { - url "https://maven.firstdarkdev.xyz/" + (project.release ? "releases" : "snapshots") + url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots") credentials { username System.getenv("MAVEN_USER") password System.getenv("MAVEN_PASS") diff --git a/Forge/build.gradle b/Forge/build.gradle index 7d79f4c..a8a0e9c 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -147,7 +147,7 @@ publishing { } repositories { maven { - url "https://maven.firstdarkdev.xyz/" + (project.release ? "releases" : "snapshots") + url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots") credentials { username System.getenv("MAVEN_USER") password System.getenv("MAVEN_PASS") diff --git a/build.gradle b/build.gradle index b17441b..2a5f09f 100644 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,7 @@ publishing { repositories { maven { - url "https://maven.firstdarkdev.xyz/" + (project.release ? "releases" : "snapshots") + url "https://maven.firstdark.dev/" + (project.release ? "releases" : "snapshots") credentials { username System.getenv("MAVEN_USER") password System.getenv("MAVEN_PASS") diff --git a/settings.gradle b/settings.gradle index 0f92eb9..971364b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,6 +12,14 @@ pluginManagement { name = 'Sponge Snapshots' url = 'https://repo.spongepowered.org/repository/maven-public/' } + maven { + name = 'Quilt (Release)' + url = 'https://maven.quiltmc.org/repository/release' + } + maven { + name = 'Quilt (Snapshot)' + url = 'https://maven.quiltmc.org/repository/snapshot' + } } }