diff --git a/patches/api/0039-Language-API.patch b/patches/api/0039-Language-API.patch
deleted file mode 100644
index 5dfa484c1..000000000
--- a/patches/api/0039-Language-API.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Sat, 1 Oct 2022 17:08:23 -0700
-Subject: [PATCH] Language API
-
-
-diff --git a/src/main/java/org/purpurmc/purpur/language/Language.java b/src/main/java/org/purpurmc/purpur/language/Language.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..cbdad4cf09c170064a45644efdf7aa0b28608301
---- /dev/null
-+++ b/src/main/java/org/purpurmc/purpur/language/Language.java
-@@ -0,0 +1,60 @@
-+package org.purpurmc.purpur.language;
-+
-+import net.kyori.adventure.translation.Translatable;
-+import org.jspecify.annotations.NullMarked;
-+import org.jspecify.annotations.Nullable;
-+
-+/**
-+ * Represents a language that can translate translation keys
-+ */
-+@NullMarked
-+public abstract class Language {
-+    private static @Nullable Language language;
-+
-+    /**
-+     * Returns the default language of the server
-+     */
-+    @Nullable
-+    public static Language getLanguage() {
-+        return language;
-+    }
-+
-+    public static void setLanguage(Language language) {
-+        if (Language.language != null) {
-+            throw new UnsupportedOperationException("Cannot redefine singleton Language");
-+        }
-+        Language.language = language;
-+    }
-+
-+    /**
-+     * Checks if a certain translation key is translatable with this language
-+     * @param key The translation key
-+     * @return Whether this language can translate the key
-+     */
-+    abstract public boolean has(String key);
-+
-+    /**
-+     * Checks if a certain translation key is translatable with this language
-+     * @param key The translation key
-+     * @return Whether this language can translate the key
-+     */
-+    public boolean has(Translatable key) {
-+        return has(key.translationKey());
-+    }
-+
-+    /**
-+     * Translates a translation key to this language
-+     * @param key The translation key
-+     * @return The translated key, or the translation key if it couldn't be translated
-+     */
-+    abstract public String getOrDefault(String key);
-+
-+    /**
-+     * Translates a translation key to this language
-+     * @param key The translation key
-+     * @return The translated key, or the translation key if it couldn't be translated
-+     */
-+    public String getOrDefault(Translatable key) {
-+        return getOrDefault(key.translationKey());
-+    }
-+}
diff --git a/patches/server/0258-Language-API.patch b/patches/server/0258-Language-API.patch
deleted file mode 100644
index 269543c15..000000000
--- a/patches/server/0258-Language-API.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MelnCat <melncatuwu@gmail.com>
-Date: Sat, 1 Oct 2022 17:08:43 -0700
-Subject: [PATCH] Language API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b9f72ee3201e1d1d7d90df055ef4876f0bd27219..badf280a6b01b06e8148c552330872d64e6256b7 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -426,6 +426,20 @@ public final class CraftServer implements Server {
-         this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager);
-         this.pluginManager.paperPluginManager = this.paperPluginManager;
-          // Paper end
-+        // Purpur start
-+        org.purpurmc.purpur.language.Language.setLanguage(new org.purpurmc.purpur.language.Language() {
-+            private net.minecraft.locale.Language language = net.minecraft.locale.Language.getInstance();
-+            @Override
-+            public boolean has(@org.jetbrains.annotations.NotNull String key) {
-+                return language.has(key);
-+            }
-+
-+            @Override
-+            public @org.jetbrains.annotations.NotNull String getOrDefault(@org.jetbrains.annotations.NotNull String key) {
-+                return language.getOrDefault(key);
-+            }
-+        });
-+        // Purpur end
- 
-         CraftRegistry.setMinecraftRegistry(console.registryAccess());
- 
diff --git a/purpur-api/src/main/java/org/purpurmc/purpur/language/Language.java b/purpur-api/src/main/java/org/purpurmc/purpur/language/Language.java
new file mode 100644
index 000000000..cbdad4cf0
--- /dev/null
+++ b/purpur-api/src/main/java/org/purpurmc/purpur/language/Language.java
@@ -0,0 +1,60 @@
+package org.purpurmc.purpur.language;
+
+import net.kyori.adventure.translation.Translatable;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Represents a language that can translate translation keys
+ */
+@NullMarked
+public abstract class Language {
+    private static @Nullable Language language;
+
+    /**
+     * Returns the default language of the server
+     */
+    @Nullable
+    public static Language getLanguage() {
+        return language;
+    }
+
+    public static void setLanguage(Language language) {
+        if (Language.language != null) {
+            throw new UnsupportedOperationException("Cannot redefine singleton Language");
+        }
+        Language.language = language;
+    }
+
+    /**
+     * Checks if a certain translation key is translatable with this language
+     * @param key The translation key
+     * @return Whether this language can translate the key
+     */
+    abstract public boolean has(String key);
+
+    /**
+     * Checks if a certain translation key is translatable with this language
+     * @param key The translation key
+     * @return Whether this language can translate the key
+     */
+    public boolean has(Translatable key) {
+        return has(key.translationKey());
+    }
+
+    /**
+     * Translates a translation key to this language
+     * @param key The translation key
+     * @return The translated key, or the translation key if it couldn't be translated
+     */
+    abstract public String getOrDefault(String key);
+
+    /**
+     * Translates a translation key to this language
+     * @param key The translation key
+     * @return The translated key, or the translation key if it couldn't be translated
+     */
+    public String getOrDefault(Translatable key) {
+        return getOrDefault(key.translationKey());
+    }
+}
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
index a39d96610..19557fefe 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
@@ -1,5 +1,26 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -426,6 +_,20 @@
+         this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager);
+         this.pluginManager.paperPluginManager = this.paperPluginManager;
+          // Paper end
++        // Purpur start - Language API
++        org.purpurmc.purpur.language.Language.setLanguage(new org.purpurmc.purpur.language.Language() {
++            private net.minecraft.locale.Language language = net.minecraft.locale.Language.getInstance();
++            @Override
++            public boolean has(@org.jetbrains.annotations.NotNull String key) {
++                return language.has(key);
++            }
++
++            @Override
++            public @org.jetbrains.annotations.NotNull String getOrDefault(@org.jetbrains.annotations.NotNull String key) {
++                return language.getOrDefault(key);
++            }
++        });
++        // Purpur end - Language API
+ 
+         CraftRegistry.setMinecraftRegistry(console.registryAccess());
+ 
 @@ -1086,6 +_,7 @@
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot