Fixes #61

samolego · Oct 20, 2021 · 91fe19c · 91fe19c
1 parent 105ddd5
commit 91fe19c
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ subprojects {
 		minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
 		mappings loom.layered() {
 			officialMojangMappings()
-			parchment("org.parchmentmc.data:parchment-1.17.1:2021.09.05-nightly-SNAPSHOT@zip")
+			parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.17@zip")
 		}
 
 		// Thanks Shedaniel :)

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -98,7 +98,7 @@ shadowJar {
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    classifier "fabric"
 }
 
 jar {
@@ -166,7 +166,7 @@ curseforge {
 
     project {
         id = "446499"
-        changelog = "A changelog can be found at https://github.com/samolego/Taterzens/releases/latest"
+        changelog = "A changelog can be found at https://github.com/samolego/Taterzens/releases/tag/${version}"
         releaseType = "release"
         addGameVersion "${project.minecraft_version}"
         addGameVersion "Fabric"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -20,7 +20,6 @@ configurations {
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
-
 }
 
 loom {
@@ -36,7 +35,9 @@ dependencies {
 
     // Libs
     modImplementation "com.github.samolego.Config2Brigadier:config2brigadier-forge:${rootProject.c2b_version}"
-    shadow("com.github.samolego.Config2Brigadier:config2brigadier-forge:${rootProject.c2b_version}")
+    shadowCommon("com.github.samolego.Config2Brigadier:config2brigadier-forge:${rootProject.c2b_version}") {
+        transitive = false
+    }
 
     common(project(path: ":common", configuration: "dev")) {
         transitive = false
@@ -48,9 +49,10 @@ dependencies {
 
 processResources {
     inputs.property "version", project.version
+    inputs.property "c2b_version", rootProject.c2b_version
 
     filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
+        expand("version": project.version, "c2b_version": rootProject.c2b_version)
     }
 }
 
@@ -64,7 +66,7 @@ shadowJar {
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
+    classifier "forge"
 }
 
 jar {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -26,4 +26,34 @@ modId = "minecraft"
 mandatory = true
 versionRange = "[1.17.1,)"
 ordering = "NONE"
-side = "SERVER"
+side = "SERVER"
+
+# C2B Lib
+modLoader = "javafml"
+loaderVersion = "[37,)"
+#issueTrackerURL = ""
+license = "LGPL-v3.0"
+
+[[mods]]
+modId = "config2brigadier"
+version = "${c2b_version}"
+displayName = "Config to Brigadier"
+authors = "samo_lego"
+description = '''
+A library to automagically generate in-game command for config editing.
+'''
+#logoFile = ""
+
+[[dependencies.config2brigadier]]
+modId = "forge"
+mandatory = true
+versionRange = "[37,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.config2brigadier]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.17.1,)"
+ordering = "NONE"
+side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ fabric_version=0.40.8+1.17
 forge_version=37.0.71
 
 # Mod Properties
-mod_version = 1.4.1
+mod_version = 1.4.2
 maven_group = org.samo_lego
 archives_base_name = taterzens