Merge pull request #3 from Darkhax-Forked/1.17

Consistency and Bug Fixes

Common/build.gradle

@@ -5,10 +5,6 @@ plugins {
 
 archivesBaseName = "${mod_name}-common-${minecraft_version}"
 
-repositories {
-    mavenCentral()
-}
-
 minecraft {
     version(minecraft_version)
     runs {   
@@ -23,3 +19,7 @@ minecraft {
         }
     }
 }
+
+dependencies {
+     compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.4'
+}

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()
@@ -43,11 +40,7 @@ processResources {
     }
 }
 
-tasks.withType(JavaCompile).configureEach {
+sourceSets.main.resources.srcDir '../Common/src/main/resources'
-    it.options.encoding = "UTF-8"
-
-    it.options.release = 16
-}
 
 tasks.withType(JavaCompile) {
     source(project(":Common").sourceSets.main.allSource)

Forge/build.gradle

@@ -64,10 +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'
-repositories {
-}
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

build.gradle

@@ -22,4 +22,26 @@ 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'
+        }
+    }
+    
+
+    tasks.withType(JavaCompile).configureEach {
+    
+        it.options.encoding = 'UTF-8'
+        it.options.release = 16
+    }
 }

gradle.properties

@@ -10,12 +10,12 @@ common_server_run_name=Common Server
 
 
 # Forge
-forge_version=37.0.82
+forge_version=37.0.85
 //forge_ats_enabled=true
 
 # Fabric
-fabric_version=0.40.1+1.17
+fabric_version=0.40.8+1.17
-fabric_loader_version=0.11.7
+fabric_loader_version=0.12.1
 
 # Mod options
 mod_name=MultiLoader