From 308f809d5d80b99d269c95c082a2d289b1ed43be Mon Sep 17 00:00:00 2001
From: coolGi2007 <sasanaps@hotmail.com>
Date: Sun, 30 Jan 2022 15:53:47 +1030
Subject: [PATCH] Cleaned up some gradle stuff

---
 common/build.gradle |  1 -
 fabric/build.gradle |  3 +--
 forge/build.gradle  | 10 +++++-----
 gradle.properties   |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index d06826840..3f3751086 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -30,5 +30,4 @@ publishing {
 
 dependencies {
     implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
 }
\ No newline at end of file
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 4559b1a91..1d61b2718 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,10 +1,9 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.0"
     id 'fabric-loom' version '0.10-SNAPSHOT'
-    id "com.modrinth.minotaur" version "1.2.1"
 }
 
-version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
+version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
 
 loom {
     accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
diff --git a/forge/build.gradle b/forge/build.gradle
index 44d5b0997..91ba3f8d5 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
-version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
+version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
 
 loom {
     accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
@@ -30,14 +30,14 @@ dependencies {
     forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
 
     // Starlight
-//    modImplementation("curse.maven:starlight-forge-526854:${project.starlight_version_forge}")
+//    modImplementation("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}")
 //    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-//    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-//    forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {})
+//    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")                      // This is already included with forge
+//    forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {})      // This is already included with forge
 
 //    forgeDependencies(project(":core")) { transitive false }
 
@@ -98,7 +98,7 @@ shadowJar {
     configurations = [project.configurations.shadowMe]
     relocate 'org.tukaani', 'shaded.tukaani'
     relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-//    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
+//    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'    // This is already included with forge
 
     relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'
 
diff --git a/gradle.properties b/gradle.properties
index 7427992f4..ddf150a4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ minecraft_version=1.18.1
 archives_base_name=DistantHorizons
 mod_version=1.6.0a-pre
 maven_group=com.seibel.lod
-toml_version=3.6.0
+toml_version=3.6.4
 
 # Mod info
 mod_name=Distant Horizons