From e2cfd1d656950ac87c187791d20458139064e6eb Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Tue, 3 Mar 2020 18:52:16 -0500
Subject: [PATCH] 1.0.4

Migrate old worlds to new ID system
---
 CHANGELOG.md                                             | 3 +++
 build.gradle                                             | 2 --
 gradle.properties                                        | 2 +-
 .../com/thebrokenrail/sorcerycraft/spell/SpellTag.java   | 9 ++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38a4eed..f9e82b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Changelog
 
+**1.0.4**
+* Migrate old worlds to new ID system
+
 **1.0.3**
 * Tweak Loot Tables
 * Fix Dispenser Bugs
diff --git a/build.gradle b/build.gradle
index 3e95cf1..01d3753 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,12 +24,10 @@ dependencies {
 
 processResources {
 	inputs.property "version", version
-	inputs.property "modid", archivesBaseName
 
 	from(sourceSets.main.resources.srcDirs) {
 		include "fabric.mod.json"
 		expand "version": version
-		expand "modid": archivesBaseName
 	}
 
 	from(sourceSets.main.resources.srcDirs) {
diff --git a/gradle.properties b/gradle.properties
index f0c6239..1d36ae6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ org.gradle.jvmargs = -Xmx1G
 	loader_version = 0.7.8+build.184
 
 # Mod Properties
-	mod_version = 1.0.3
+	mod_version = 1.0.4
 	maven_group = com.thebrokenrail
 	archives_base_name = sorcerycraft
 
diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/spell/SpellTag.java b/src/main/java/com/thebrokenrail/sorcerycraft/spell/SpellTag.java
index 230ba59..a751ac1 100644
--- a/src/main/java/com/thebrokenrail/sorcerycraft/spell/SpellTag.java
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/spell/SpellTag.java
@@ -1,5 +1,6 @@
 package com.thebrokenrail.sorcerycraft.spell;
 
+import com.thebrokenrail.sorcerycraft.SorceryCraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -64,7 +65,13 @@ public class SpellTag {
 
         for (int i = 0; i < spells.size(); i++) {
             CompoundTag spell = spells.getCompound(i);
-            Identifier id = new Identifier(spell.getString("id"));
+
+            String idStr = spell.getString("id");
+            Identifier id = new Identifier(idStr);
+            if (!idStr.equals(id.toString())) {
+                id = new Identifier(SorceryCraft.NAMESPACE, idStr);
+            }
+
             int level = spell.getInt("level");
             if (map.get(id) == null || map.get(id) < level) {
                 map.put(id, level);