From 07b5f427402ddd7d5165fbc6efccd71ad6f1b1c7 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 22:38:19 -0600 Subject: [PATCH 1/7] Fix inconsistent repository definitions. --- Common/build.gradle | 4 ---- Fabric/build.gradle | 3 --- Forge/build.gradle | 3 --- build.gradle | 15 +++++++++++++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Common/build.gradle b/Common/build.gradle index 625ca81..77715a4 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -5,10 +5,6 @@ plugins { archivesBaseName = "${mod_name}-common-${minecraft_version}" -repositories { - mavenCentral() -} - minecraft { version(minecraft_version) runs { diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 0e8585d..58361f0 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -6,9 +6,6 @@ plugins { archivesBaseName = "${mod_name}-fabric-${minecraft_version}" -repositories { -} - dependencies { minecraft "com.mojang:minecraft:${minecraft_version}" mappings loom.officialMojangMappings() diff --git a/Forge/build.gradle b/Forge/build.gradle index 8ab190f..486681c 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -66,9 +66,6 @@ minecraft { sourceSets.main.resources { srcDir 'src/generated/resources' } -repositories { -} - dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" compileOnly project(":Common") diff --git a/build.gradle b/build.gradle index 53bd109..b56fb56 100644 --- a/build.gradle +++ b/build.gradle @@ -22,4 +22,19 @@ subprojects { ]) } } + + repositories { + + mavenCentral() + + maven { + name = 'Sponge / Mixin' + url = 'https://repo.spongepowered.org/repository/maven-public/' + } + + maven { + name = 'BlameJared Maven (CrT / Bookshelf)' + url = 'https://maven.blamejared.com' + } + } } \ No newline at end of file From 8550e017a18b0ee054eebd3e8861c23718247c9b Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 22:40:10 -0600 Subject: [PATCH 2/7] Apply UTF-8 encoding and J16 release level consistently. --- Fabric/build.gradle | 6 ------ build.gradle | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 58361f0..d68995b 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -40,12 +40,6 @@ processResources { } } -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - - it.options.release = 16 -} - tasks.withType(JavaCompile) { source(project(":Common").sourceSets.main.allSource) } diff --git a/build.gradle b/build.gradle index b56fb56..3c9e9e0 100644 --- a/build.gradle +++ b/build.gradle @@ -37,4 +37,11 @@ subprojects { url = 'https://maven.blamejared.com' } } + + + tasks.withType(JavaCompile).configureEach { + + it.options.encoding = 'UTF-8' + it.options.release = 16 + } } \ No newline at end of file From 2ddb1a3228284a9662ecfb0a21539eee80f88d19 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 22:44:52 -0600 Subject: [PATCH 3/7] Allow Mixins in the Common environment. --- Common/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Common/build.gradle b/Common/build.gradle index 77715a4..6b0b328 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -18,4 +18,8 @@ minecraft { } } } +} + +dependencies { + implementation 'org.spongepowered:mixin:0.8.4' } \ No newline at end of file From 52f493e141bf52275fdd73a78d70d8285bbd600a Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 22:46:15 -0600 Subject: [PATCH 4/7] Include Common/src/resources in Forge and Fabric resources sourceset. --- Fabric/build.gradle | 2 ++ Forge/build.gradle | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Fabric/build.gradle b/Fabric/build.gradle index d68995b..6d00e8e 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -40,6 +40,8 @@ processResources { } } +sourceSets.main.resources.srcDir '../Common/src/main/resources' + tasks.withType(JavaCompile) { source(project(":Common").sourceSets.main.allSource) } diff --git a/Forge/build.gradle b/Forge/build.gradle index 486681c..0da8dc6 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -64,7 +64,8 @@ minecraft { } } -sourceSets.main.resources { srcDir 'src/generated/resources' } +sourceSets.main.resources.srcDir 'src/generated/resources' +sourceSets.main.resources.srcDir '../Common/src/main/resources' dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" From 13e195e836166156c0d8258a744487c8475d3640 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 22:51:02 -0600 Subject: [PATCH 5/7] Update Forge to 37.0.85 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7aed17c..4998098 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ common_server_run_name=Common Server # Forge -forge_version=37.0.82 +forge_version=37.0.85 //forge_ats_enabled=true # Fabric From 40b2b34720dbe2f61a6632b2e77c937f09458aa8 Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 22:52:26 -0600 Subject: [PATCH 6/7] Update Fabric Loader to 0.12.1 and Fabric API to 0.40.8 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4998098..9b36e67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,8 +14,8 @@ forge_version=37.0.85 //forge_ats_enabled=true # Fabric -fabric_version=0.40.1+1.17 -fabric_loader_version=0.11.7 +fabric_version=0.40.8+1.17 +fabric_loader_version=0.12.1 # Mod options mod_name=MultiLoader From 4e49e277f3d1d78bd847dc60ec8535f7ca41881e Mon Sep 17 00:00:00 2001 From: Tyler Hancock Date: Mon, 11 Oct 2021 23:08:24 -0600 Subject: [PATCH 7/7] Make Mixin compileOnly in Common. --- Common/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/build.gradle b/Common/build.gradle index 6b0b328..eeda84e 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -21,5 +21,5 @@ minecraft { } dependencies { - implementation 'org.spongepowered:mixin:0.8.4' + compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.4' } \ No newline at end of file