Merge branch '1.7.7.x' into craftable-chainmail-armor

# Conflicts: # README.md # build.gradle # gradle.properties # src/main/java/rootenginear/playground/Playground.java # src/main/resources/fabric.mod.json
rootEnginear · Apr 16, 2024 · 211a7d1 · 211a7d1
2 parents 9f46c54 + cdd5770
commit 211a7d1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -5,4 +5,5 @@
 Craft chainmail armors from chainlinks.
 
 > **Important**
-> Required [Babric](https://github.com/Turnip-Labs/babric-instance-repo/releases) and [HalpLibe >= 3.0.2](https://github.com/Turnip-Labs/bta-halplibe/releases) to run the mod.
+> - Required [Babric](https://github.com/Turnip-Labs/babric-instance-repo/releases) to run the mod.
+> - Required [HalpLibe](https://github.com/Turnip-Labs/bta-halplibe/releases) in BTA version 7.1 and later.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'babric-loom' version '1.1.+'
+	id 'babric-loom' version '1.4.+'
 	id 'java'
 }
 
@@ -83,20 +83,21 @@ dependencies {
 
 	// Helper library
 	// If you do not need Halplibe you can comment this line out or delete this line
- 	modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}"
+	modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}"
 
-	modImplementation "ModMenu:ModMenu:2.0.3"
+	modImplementation "ModMenu:ModMenu:${project.mod_menu_version}"
 
 	implementation "org.slf4j:slf4j-api:1.8.0-beta4"
 	implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0"
 
-	implementation 'com.google.guava:guava:30.0-jre'
+	implementation 'com.google.guava:guava:33.0.0-jre'
 	implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
-
 	var log4jVersion = "2.20.0"
 	implementation("org.apache.logging.log4j:log4j-core:${log4jVersion}")
 	implementation("org.apache.logging.log4j:log4j-api:${log4jVersion}")
 	implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}")
+
+	include(implementation("org.apache.commons:commons-lang3:3.12.0"))
 }
 
 java {
@@ -105,7 +106,7 @@ java {
 	withSourcesJar()
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
 	options.release.set 8
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,16 @@
 org.gradle.jvmargs=-Xmx4G
 
 # BTA
-bta_version=7.1-pre1
+bta_version=7.1
 
-# Loader
-loader_version=0.14.19-babric.2-bta
+# Loader & Mod Menu
+loader_version=0.15.6-babric.4-bta
+mod_menu_version=2.0.5
 
 # HalpLibe
-halplibe_version=3.0.2
+halplibe_version=3.5.2
 
 # Mod
-mod_version=2.0.0-pre1
+mod_version=1.1.0
 mod_group=rootenginear
 mod_name=craftablechainmailarmor
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -19,12 +19,22 @@
 		"main": [
 			"rootenginear.craftablechainmailarmor.CraftableChainmailArmor"
 		],
+		"beforeGameStart": [
+			"rootenginear.craftablechainmailarmor.CraftableChainmailArmor"
+		],
+		"afterGameStart": [
+			"rootenginear.craftablechainmailarmor.CraftableChainmailArmor"
+		],
 		"recipesReady": [
 			"rootenginear.craftablechainmailarmor.recipe.ChainmailRecipes"
 		]
 	},
 	"depends": {
-		"fabricloader": ">=0.13.3",
-		"halplibe": ">=3.0.2"
+		"minecraft": "7.1",
+		"fabricloader": ">=0.15.5",
+		"halplibe": ">=3.5.2"
+	},
+	"suggests": {
+		"modmenu": ">=2.0.5"
 	}
 }