1.21.11 changes:

- 1.21.11 support
- Fix some typos
- Update German and Russian translation
- Bump version

Author: Foxikle

build.gradle.kts

@@ -38,6 +38,7 @@ repositories {
 
 dependencies {
     implementation(project(":core"))
+    implementation(project(":v1_21_R6"))
     implementation(project(":v1_21_R5"))
     implementation(project(":v1_21_R4"))
     implementation(project(":v1_21_R3"))
@@ -50,7 +51,7 @@ dependencies {
     implementation(project(":v1_20_R1", "reobf"))
 }
 
-var pluginVersion = "1.7.7"
+var pluginVersion = "1.7.8"
 
 allprojects {
     group = "dev.foxikle"

core/src/main/java/dev/foxikle/customnpcs/internal/CustomNPCs.java

@@ -104,11 +104,11 @@ public final class CustomNPCs extends JavaPlugin implements PluginMessageListene
      * Used to close the deletion menu if it was opened by the command. true = open the menu
      */
     @Getter
-    private final Cache<UUID, Boolean> deltionReason = CacheBuilder.newBuilder().expireAfterWrite(1,
+    private final Cache<UUID, Boolean> deletionReason = CacheBuilder.newBuilder().expireAfterWrite(1,
             TimeUnit.MINUTES).expireAfterAccess(1, TimeUnit.MINUTES).build();
     private final String[] COMPATIBLE_VERSIONS = {"1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
             "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9",
-            "1.21.10"};
+            "1.21.10", "1.21.11"};
     private final String NPC_CLASS = "dev.foxikle.customnpcs.versions.NPC_%s";
     /**
      * The map of what the plugin is waiting for the players to enter.
@@ -513,6 +513,7 @@ public String translateVersion() {
             case "1.21.5" -> "v1_21_R3";
             case "1.21.6", "1.21.7", "1.21.8" -> "v1_21_R4";
             case "1.21.9", "1.21.10" -> "v1_21_R5";
+            case "1.21.11" -> "v1_21_R6";
             default -> "";
         };
     }

core/src/main/java/dev/foxikle/customnpcs/internal/commands/DeleteCommand.java

@@ -59,7 +59,7 @@ public void usage(
 
         assert finalNpc != null;
         plugin.getEditingNPCs().put(p.getUniqueId(), finalNpc);
-        plugin.getDeltionReason().put(p.getUniqueId(), false);
+        plugin.getDeletionReason().put(p.getUniqueId(), false);
         plugin.getLotus().openMenu(p, MenuUtils.NPC_DELETE);
     }
 }

core/src/main/java/dev/foxikle/customnpcs/internal/listeners/Listeners.java

@@ -530,7 +530,9 @@ public void onPlayerLogin(PlayerJoinEvent e) {
         Player player = e.getPlayer();
 
         if (plugin.update && plugin.getConfig().getBoolean("AlertOnUpdate") && player.hasPermission("customnpcs.alert")) {
-            player.sendMessage(Msg.translate(player.locale(), "customnpcs.should_update"));
+            player.sendMessage(Msg.translate(player.locale(), "customnpcs.should_update").appendNewline()
+                    .append(Msg.format("<click:open_url:https://modrinth" +
+                            ".com/plugin/customnpcs/versions><b><#1bd96a>[Modrinth]")));
         }
         recalcSleepingPercentages();
         if (player.getGameMode() == GameMode.SPECTATOR) return;

core/src/main/java/dev/foxikle/customnpcs/internal/menu/DeleteMenu.java

@@ -94,7 +94,7 @@ public InventoryType getMenuType() {
                                 return;
                             }
 
-                            Boolean openMenu = plugin.getDeltionReason().getIfPresent(player1.getUniqueId());
+                            Boolean openMenu = plugin.getDeletionReason().getIfPresent(player1.getUniqueId());
                             NpcDeleteEvent.DeletionSource source;
                             if (openMenu == null) {
                                 source = NpcDeleteEvent.DeletionSource.UNKNOWN;
@@ -131,7 +131,7 @@ public InventoryType getMenuType() {
                                 return;
                             }
 
-                            Boolean openMenu = plugin.getDeltionReason().getIfPresent(player1.getUniqueId());
+                            Boolean openMenu = plugin.getDeletionReason().getIfPresent(player1.getUniqueId());
 
                             if (openMenu == null) {
                                 player.closeInventory(InventoryCloseEvent.Reason.PLUGIN);

core/src/main/java/dev/foxikle/customnpcs/internal/menu/MainNPCMenu.java

@@ -137,7 +137,7 @@ public String getName() {
         if (plugin.getNPCByID(npc.getUniqueID()) != null)
             builder.setButton(44, Button.clickable(MenuItems.deleteNpc(player), ButtonClickAction.plain((menu, event) -> {
                 Player p = (Player) event.getWhoClicked();
-                plugin.getDeltionReason().put(p.getUniqueId(), true);
+                plugin.getDeletionReason().put(p.getUniqueId(), true);
                 plugin.getLotus().openMenu(p, MenuUtils.NPC_DELETE);
                 p.playSound(p, Sound.UI_BUTTON_CLICK, 1.0F, 1.0F);
             })));

core/src/main/resources/localization/German_de.properties

@@ -36,3 +36,5 @@ include("v1_21_R2")
 include("v1_21_R3")
 include("v1_21_R4")
 include("v1_21_R5")
+include("v1_21_R6")
+

core/src/main/resources/localization/Russian_ru.properties

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2024-2025. Foxikle
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+plugins {
+    id("java")
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
+    id("io.freefair.lombok") version "9.0.0"
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven("https://jitpack.io")
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+}
+
+dependencies {
+    compileOnly("me.clip:placeholderapi:2.11.6")
+    compileOnly(project(":core"))
+//    TODO: Remove the "rc1-" part...
+    paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
+}
+
+tasks {
+    java {
+        toolchain.languageVersion = JavaLanguageVersion.of(21)
+    }
+
+    compileJava {
+        options.release = 21
+    }
+
+    jar {
+        archiveClassifier = "v1_21_R5"
+    }
+}