Buildscript changes

samolego · Mar 23, 2022 · 70ec091 · 70ec091
1 parent 7f81cb8
commit 70ec091
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false
 
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
 	id "com.modrinth.minotaur" version "1.1.0"
@@ -77,7 +77,7 @@ allprojects {
 		it.options.encoding = "UTF-8"
 
 		// Minecraft 1.17 (21w19a) upwards uses Java 16.
-		it.options.release = 16
+		it.options.release = 17
 	}
 
 

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -36,7 +36,7 @@ def ENV = System.getenv();
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
 
     // C2B
     modImplementation(include("com.github.samolego.Config2Brigadier:config2brigadier-fabric:${rootProject.c2b_version}"))

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -32,7 +32,7 @@
 
   "depends": {
     "fabricloader": ">=0.7.4",
-    "fabric": ">=0.45.1"
+    "fabric": ">=0.48.0"
   },
   "recommends": {
     "disguiselib": ">=1.2.1"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -38,9 +38,10 @@ dependencies {
     shadowCommon("com.github.samolego.Config2Brigadier:config2brigadier-forge:${rootProject.c2b_version}") { transitive false }
 
     // SGUI
-    //modImplementation("com.github.samolego:forgified-sgui:${project.fsgui_version}")
-    //shadowCommon("com.github.samolego:forgified-sgui:${project.fsgui_version}") { transitive false }
-    modImplementation(shadowCommon("eu.pb4:sgui:${rootProject.sgui_version}") { transitive false })
+    modImplementation("com.github.samolego:forgified-sgui:${project.fsgui_version}")
+    shadowCommon("com.github.samolego:forgified-sgui:${project.fsgui_version}") { transitive false }
+    //modImplementation("eu.pb4:sgui:${rootProject.sgui_version}")
+    //shadowCommon("eu.pb4:sgui:${rootProject.sgui_version}") { transitive false }
 
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 minecraft_version=1.18.2
@@ -13,7 +13,7 @@ fabric_version=0.48.0+1.18.2
 forge_version=40.0.19
 
 # Mod Properties
-mod_version = 1.8.4
+mod_version = 1.8.5
 maven_group = org.samo_lego
 archives_base_name = taterzens