Fix final build issues

Keweenaw-Kube · Jun 10, 2021 · e83f5e0 · e83f5e0
1 parent 942495d
commit e83f5e0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,10 +11,10 @@ archivesBaseName = project.archives_base_name
 version = gitVersion()
 group = project.maven_group
 
-configurations {
-	provided
-	compile.extendsFrom(provided)
-}
+//configurations {
+//	provided
+//	compile.extendsFrom(provided)
+//}
 
 dependencies {
 	// To change the versions see the gradle.properties file
@@ -23,8 +23,14 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	// compile 'org.yaml:snakeyaml:1.27'
-	provided 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1'
+	modImplementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
+	modImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1'
+
+	include 'com.fasterxml.jackson.core:jackson-annotations:2.11.1'
+	include 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
+	include 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1'
+	include 'com.fasterxml.jackson.core:jackson-core:2.11.1'
+	include 'org.yaml:snakeyaml:1.29'
 }
 
 processResources {
@@ -57,12 +63,18 @@ jar {
 	from("LICENSE") {
 		rename { "${it}_${project.archivesBaseName}"}
 	}
-
-	from {
-		configurations.provided.collect { it.isDirectory() ? it : zipTree(it) }
-	}
 }
 
+//jar {
+//	from("LICENSE") {
+//		rename { "${it}_${project.archivesBaseName}"}
+//	}
+//
+//	from {
+//		configurations.provided.collect { it.isDirectory() ? it : zipTree(it) }
+//	}
+//}
+
 // configure the maven publication
 publishing {
 	publications {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,8 +22,9 @@
     "modid.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.7.4",
-    "fabric": ">=0.28.0",
-    "minecraft": "1.16.x"
+    "fabricloader": ">=0.11.3",
+    "fabric": "*",
+    "minecraft": "1.17.x",
+    "java": ">=16"
   }
 }
diff --git a/src/main/resources/modid.mixins.json b/src/main/resources/modid.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.fabricmc.diorite.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": ["ServerLoginNetworkHandlerAccessor"],
   "client": [],
   "injectors": {