diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryDouble.java b/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryDouble.java
diff --git a/...ore/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryFieldReference.java b/...ore/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryFieldReference.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryFloat.java b/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryFloat.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryInteger.java b/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryInteger.java
diff --git a/...in/java/ca/jarcode/classloading/instrument/ConstantPoolEntryInterfaceMethodReference.java b/...in/java/ca/jarcode/classloading/instrument/ConstantPoolEntryInterfaceMethodReference.java
diff --git a/...core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryInvokeDynamic.java b/...core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryInvokeDynamic.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryLong.java b/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryLong.java
diff --git a/...-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryMethodHandle.java b/...-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryMethodHandle.java
diff --git a/...re/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryMethodReference.java b/...re/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryMethodReference.java
diff --git a/...es-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryMethodType.java b/...es-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryMethodType.java
diff --git a/...s-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryNameAndType.java b/...s-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryNameAndType.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryString.java b/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryString.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryUtf8.java b/consoles-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolEntryUtf8.java
diff --git a/...les-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolValueRetriever.java b/...les-core/src/main/java/ca/jarcode/classloading/instrument/ConstantPoolValueRetriever.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/loader/ClassModifier.java b/consoles-core/src/main/java/ca/jarcode/classloading/loader/ClassModifier.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/loader/MinecraftVersionModifier.java b/consoles-core/src/main/java/ca/jarcode/classloading/loader/MinecraftVersionModifier.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/loader/WrappedClassLoader.java b/consoles-core/src/main/java/ca/jarcode/classloading/loader/WrappedClassLoader.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/loader/WrappedPlugin.java b/consoles-core/src/main/java/ca/jarcode/classloading/loader/WrappedPlugin.java
diff --git a/consoles-core/src/main/java/ca/jarcode/classloading/loader/WrappedPluginLoader.java b/consoles-core/src/main/java/ca/jarcode/classloading/loader/WrappedPluginLoader.java
diff --git a/consoles-core/src/main/java/ca/jarcode/consoles/Consoles.java b/consoles-core/src/main/java/ca/jarcode/consoles/Consoles.java
@@ -1,7 +1,5 @@
 package ca.jarcode.consoles;
 
-import ca.jarcode.classloading.loader.WrappedPlugin;
-import ca.jarcode.consoles.api.InternalHooks;
 import ca.jarcode.consoles.api.impl.InternalFunctions;
 import ca.jarcode.consoles.api.nms.ConsolesNMS;
 import ca.jarcode.consoles.images.ImageConsoleHandler;
@@ -10,6 +8,7 @@
 import ca.jarcode.consoles.command.*;
 import ca.jarcode.consoles.util.sync.SyncTaskScheduler;
 import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.function.Supplier;
 
@@ -19,7 +18,7 @@
 events, static stuff, and configuration reading.
 
  */
-public class Consoles extends WrappedPlugin {
+public class Consoles extends JavaPlugin {
 
 	private static Consoles instance;
 
@@ -28,14 +27,6 @@ public class Consoles extends WrappedPlugin {
 	// debug mode
 	public static boolean debug = false;
 
-	static {
-		if (!Consoles.class.getClassLoader().getClass().getSimpleName().equals("WrappedClassLoader")) {
-			Thread.dumpStack();
-			System.exit(0);
-			throw new RuntimeException();
-		}
-	}
-
 	public static Consoles getInstance() {
 		return instance;
 	}

diff --git a/consoles-core/src/main/java/ca/jarcode/consoles/ConsolesLoader.java b/consoles-core/src/main/java/ca/jarcode/consoles/ConsolesLoader.java
diff --git a/consoles-core/src/main/java/ca/jarcode/consoles/util/MonospacedMinecraftFont.java b/consoles-core/src/main/java/ca/jarcode/consoles/util/MonospacedMinecraftFont.java