From a2c33c7cae46d5eaeb3434701ed6b8daf6f6a130 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Mon, 6 Apr 2020 16:00:38 -0400
Subject: [PATCH] 1.0.5

Fix JAR Shadowing
---
 CHANGELOG.md      |  3 +++
 build.gradle      | 19 +++++++++++++++++++
 gradle.properties |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 156d642..0284c67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+**1.0.5**
+* Fix JAR Shadowing
+
 **1.0.4**
 * Bug Fixes
 
diff --git a/build.gradle b/build.gradle
index 7e58c8e..7da7499 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,24 @@ dependencies {
 	shadow "com.squareup.moshi:moshi:${project.moshi_version}"
 }
 
+shadowJar {
+	configurations = [project.configurations.shadow]
+	classifier 'shadow-dev'
+}
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+	target = tasks.shadowJar
+	prefix = "${project.group}.${project.archivesBaseName}.shadow"
+}
+tasks.shadowJar.dependsOn tasks.relocateShadowJar
+
+remapJar {
+	dependsOn shadowJar
+	input.set shadowJar.archiveFile.get()
+}
+
 processResources {
 	inputs.property 'version', mod_version
 	inputs.property 'name', rootProject.name
@@ -63,6 +81,7 @@ tasks.withType(JavaCompile) {
 task sourcesJar(type: Jar, dependsOn: classes) {
 	classifier 'sources'
 	from sourceSets.main.allSource
+	from sourceSets.main.resources
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
diff --git a/gradle.properties b/gradle.properties
index 51731e2..4191784 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
 	fabric_loader_version = 0.7.10+build.191
 
 # Mod Properties
-	mod_version = 1.0.4
+	mod_version = 1.0.5
 	maven_group = com.thebrokenrail
 	archives_base_name = reliccraft