From f40e44e3667f14d468324c584ab078758f4a6593 Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sat, 21 Mar 2020 11:49:58 -0400
Subject: [PATCH] 1.2.1

Fix Launching Without ModMenu
---
 CHANGELOG.md                                  |  3 +++
 gradle.properties                             |  2 +-
 .../sorcerycraft/client/ModMenu.java          | 20 +++++++++++++++++++
 .../client/SorceryCraftClient.java            | 15 +-------------
 src/main/resources/fabric.mod.json            |  2 +-
 5 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/com/thebrokenrail/sorcerycraft/client/ModMenu.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8940f24..80cda58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+**1.2.1**
+* Fix Launching Without ModMenu
+
 **1.2**
 * Update Mappings
 * Update API (More Consistent Package Names)
diff --git a/gradle.properties b/gradle.properties
index 34816e2..fd45c6b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
 	fabric_loader_version = 0.7.8+build.189
 
 # Mod Properties
-	mod_version = 1.2.0
+	mod_version = 1.2.1
 	maven_group = com.thebrokenrail
 	archives_base_name = sorcerycraft
 
diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/client/ModMenu.java b/src/main/java/com/thebrokenrail/sorcerycraft/client/ModMenu.java
new file mode 100644
index 0000000..d14d9bf
--- /dev/null
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/client/ModMenu.java
@@ -0,0 +1,20 @@
+package com.thebrokenrail.sorcerycraft.client;
+
+import com.thebrokenrail.sorcerycraft.ModConfig;
+import com.thebrokenrail.sorcerycraft.SorceryCraft;
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
+import io.github.prospector.modmenu.api.ModMenuApi;
+import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import net.minecraft.client.gui.screen.Screen;
+
+public class ModMenu implements ModMenuApi {
+    @Override
+    public String getModId() {
+        return SorceryCraft.NAMESPACE;
+    }
+
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get();
+    }
+}
diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/client/SorceryCraftClient.java b/src/main/java/com/thebrokenrail/sorcerycraft/client/SorceryCraftClient.java
index 3fe33c5..39428a5 100644
--- a/src/main/java/com/thebrokenrail/sorcerycraft/client/SorceryCraftClient.java
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/client/SorceryCraftClient.java
@@ -6,8 +6,6 @@ import com.thebrokenrail.sorcerycraft.client.entity.SpellEntityRenderer;
 import com.thebrokenrail.sorcerycraft.client.gui.CastingTableScreen;
 import com.thebrokenrail.sorcerycraft.gui.CastingTableScreenHandler;
 import com.thebrokenrail.sorcerycraft.packet.UpdateKnownSpellsS2CPacket;
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
 import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
 import me.sargunvohra.mcmods.autoconfig1u.gui.registry.GuiRegistry;
 import me.sargunvohra.mcmods.autoconfig1u.util.Utils;
@@ -17,14 +15,13 @@ import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry;
 import net.fabricmc.fabric.impl.networking.ClientSidePacketRegistryImpl;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.Collections;
 
-public class SorceryCraftClient implements ClientModInitializer, ModMenuApi {
+public class SorceryCraftClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         GuiRegistry guiRegistry = AutoConfig.getGuiRegistry(ModConfig.class);
@@ -41,14 +38,4 @@ public class SorceryCraftClient implements ClientModInitializer, ModMenuApi {
 
         ClientSidePacketRegistryImpl.INSTANCE.register(new Identifier(SorceryCraft.NAMESPACE, "update_known_spells"), UpdateKnownSpellsS2CPacket::handle);
     }
-
-    @Override
-    public String getModId() {
-        return SorceryCraft.NAMESPACE;
-    }
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get();
-    }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 9a172b7..8553a83 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,7 +23,7 @@
             "com.thebrokenrail.sorcerycraft.client.SorceryCraftClient"
         ],
         "modmenu": [
-            "com.thebrokenrail.sorcerycraft.client.SorceryCraftClient"
+            "com.thebrokenrail.sorcerycraft.client.ModMenu"
         ]
     },
     "mixins": [