From 32c9fb58d33320b8b6c3bc8d879ce793fa516f8d Mon Sep 17 00:00:00 2001
From: Anthony Hilyard <anthony.hilyard@gmail.com>
Date: Thu, 14 Oct 2021 10:43:06 -0700
Subject: Fixed crash issues from gradle project naming.

---
 build.gradle                          | 2 +-
 gradle.properties                     | 4 ++--
 settings.gradle                       | 2 ++
 src/main/resources/META-INF/mods.toml | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 settings.gradle

diff --git a/build.gradle b/build.gradle
index a3ff7bb..14f3be1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'eclipse'
 
-archivesBaseName = name + '-' + mcVersion
+archivesBaseName = project.name + '-' + project.mcVersion
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(16)
 
diff --git a/gradle.properties b/gradle.properties
index cf5e124..832ac67 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,8 +3,8 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-name=Iceberg
-group=com.anthonyhilyard.iceberg
+name=${rootProject.name}
+group=com.anthonyhilyard.${name.toLowerCase()}
 author=anthonyhilyard
 version=1.0.12
 mcVersion=1.17.1
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..d318b0e
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+// Set the root project name so that the workspace folder name doesn't mess stuff up.
+rootProject.name = "Iceberg"
\ No newline at end of file
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 63fbef3..7623938 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ license="CC BY-NC-ND 4.0"
 
 [[mods]]
 modId="iceberg"
-version="${version}"
+version="${file.jarVersion}"
 displayName="Iceberg"
 displayURL="https://anthonyhilyard.com/"
 updateJSONURL="https://mc-curse-update-checker.herokuapp.com/520110"
-- 
cgit