Merge pull request #3595 from kosma/fabric-gradle-cleanup

Cleanup Fabric Gradle projects

fabric-1.14.4/build.gradle

@@ -1,19 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+	id 'fabric-loom' version '0.10.65'
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
-    }
 }
-apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+archivesBaseName = "Dynmap"
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
 
@@ -23,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
@@ -45,19 +28,11 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
+java {
-// this fixes some edge cases with special characters not displaying correctly
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // if it is present.
-tasks.withType(JavaCompile) {
+    // If you remove this line, sources will not be generated.
-    options.encoding = "UTF-8"
+    withSourcesJar()
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
 }
 
 jar {
@@ -68,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {

fabric-1.14.4/gradle.properties

@@ -1,12 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.14.4
 yarn_mappings=1.14.4+build.18
-loader_version=0.10.1+build.209
+loader_version=0.12.12
-# Mod Properties
+fabric_version=0.28.5+1.14
-archives_base_name=Dynmap
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.28.5+1.14

fabric-1.14.4/src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.14.4"
   }

fabric-1.15.2/build.gradle

@@ -1,19 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+	id 'fabric-loom' version '0.10.65'
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
-    }
 }
-apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+archivesBaseName = "Dynmap"
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
 
@@ -23,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
@@ -45,19 +28,11 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
+java {
-// this fixes some edge cases with special characters not displaying correctly
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // if it is present.
-tasks.withType(JavaCompile) {
+    // If you remove this line, sources will not be generated.
-    options.encoding = "UTF-8"
+    withSourcesJar()
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
 }
 
 jar {
@@ -68,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {

fabric-1.15.2/gradle.properties

@@ -1,12 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.15.2
 yarn_mappings=1.15.2+build.17
-loader_version=0.10.1+build.209
+loader_version=0.12.12
-# Mod Properties
+fabric_version=0.28.5+1.15
-archives_base_name=Dynmap
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.23.0+build.328-1.15

fabric-1.15.2/src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.15.2"
   }

fabric-1.16.4/build.gradle

@@ -1,19 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+	id 'fabric-loom' version '0.10.65'
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
-    }
 }
-apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+archivesBaseName = "Dynmap"
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
 
@@ -23,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
@@ -45,19 +28,11 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
+java {
-// this fixes some edge cases with special characters not displaying correctly
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // if it is present.
-tasks.withType(JavaCompile) {
+    // If you remove this line, sources will not be generated.
-    options.encoding = "UTF-8"
+    withSourcesJar()
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
 }
 
 jar {
@@ -68,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {

fabric-1.16.4/gradle.properties

@@ -1,12 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.16.4
 yarn_mappings=1.16.4+build.6
-loader_version=0.10.6+build.214
+loader_version=0.12.12
-# Mod Properties
+fabric_version=0.42.0+1.16
-archives_base_name=Dynmap
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.25.1+build.416-1.16

fabric-1.16.4/src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.16.x"
   }

fabric-1.17.1/build.gradle

@@ -1,19 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+	id 'fabric-loom' version '0.10.65'
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.8-SNAPSHOT'
-    }
 }
-apply plugin: 'fabric-loom'
 
-sourceCompatibility = JavaVersion.VERSION_16
+archivesBaseName = "Dynmap"
-targetCompatibility = JavaVersion.VERSION_16
-
-archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
 
@@ -23,20 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
@@ -45,23 +28,14 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
+java {
-// this fixes some edge cases with special characters not displaying correctly
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // if it is present.
-tasks.withType(JavaCompile) {
+    // If you remove this line, sources will not be generated.
-    options.encoding = "UTF-8"
+    withSourcesJar()
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
 }
 
 jar {
-    duplicatesStrategy = 'include'
     from "LICENSE"
     from {
         configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }
@@ -69,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {

fabric-1.17.1/gradle.properties

@@ -1,12 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-# Fabric Properties
-# check these on https://fabricmc.net/use
 minecraft_version=1.17.1
 yarn_mappings=1.17.1+build.1
-loader_version=0.11.6
+loader_version=0.12.12
-# Mod Properties
+fabric_version=0.45.1+1.17
-archives_base_name=Dynmap
-# Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.36.1+1.17

fabric-1.17.1/src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.7.4",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.17.0",
     "minecraft": "1.17.1"
   }

fabric-1.18/build.gradle

@@ -1,24 +1,8 @@
-buildscript {
+plugins {
-    repositories {
+	id 'fabric-loom' version '0.10.65'
-        maven { url = 'https://maven.fabricmc.net/' }
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.10-SNAPSHOT'
-    }
-}
-apply plugin: 'fabric-loom'
-loom {
-    runConfigs.configureEach {
-        ideConfigGenerated = true
-    }
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
+archivesBaseName = "Dynmap"
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = parent.version
 group = parent.group
 
@@ -28,21 +12,14 @@ configurations {
 }
 
 dependencies {
-    //to change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
     shadow project(path: ':DynmapCore', configuration: 'shadow')
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
-
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
 }
 
 processResources {
@@ -51,23 +28,14 @@ processResources {
     }
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
+java {
-// this fixes some edge cases with special characters not displaying correctly
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // if it is present.
-tasks.withType(JavaCompile) {
+    // If you remove this line, sources will not be generated.
-    options.encoding = "UTF-8"
+    withSourcesJar()
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
 }
 
 jar {
-    duplicatesStrategy = 'include'
     from "LICENSE"
     from {
         configurations.shadow.collect { it.toString().contains("guava") ? null : it.isDirectory() ? it : zipTree(it) }
@@ -75,8 +43,8 @@ jar {
 }
 
 remapJar {
-    archiveName = "${archivesBaseName}-${version}-fabric-${project.minecraft_version}.jar"
+    archiveFileName = "${archivesBaseName}-${project.version}-fabric-${project.minecraft_version}.jar"
-    destinationDir = file '../target'
+    destinationDirectory = file '../target'
 }
 
 remapJar.doLast {

fabric-1.18/gradle.properties

@@ -1,14 +1,4 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-
-# Mod Properties
-archives_base_name=Dynmap
-
-# Fabric Properties
-# check these on https://fabricmc.net/versions.html
 minecraft_version=1.18
 yarn_mappings=1.18+build.1
-loader_version=0.12.6
+loader_version=0.12.12
-
+fabric_version=0.45.1+1.18
-#Fabric api
-fabric_version=0.43.1+1.18

fabric-1.18/src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.12.6",
+    "fabricloader": ">=0.12.12",
     "fabric": ">=0.43.1",
     "minecraft": "1.18.x"
   }

settings.gradle

@@ -2,6 +2,7 @@ pluginManagement {
   repositories {
     gradlePluginPortal()
     maven { url "https://papermc.io/repo/repository/maven-public/" }
+    maven { url "https://maven.fabricmc.net/" }
   }
 }