1.21.5に対応（PaperMC向けの修正）

Author: yuttyann

.gitignore

@@ -51,3 +51,5 @@ WIKI_JP.md
 *.bak
 
 dependency-reduced-pom.xml
+
+.codegpt

README.md

@@ -1,4 +1,4 @@
-[Java11] ScriptBlockPlus [MC1.9-1.21] [![](https://jitpack.io/v/yuttyann/ScriptBlockPlus.svg)](https://jitpack.io/#yuttyann/ScriptBlockPlus)
+[Java11] ScriptBlockPlus [MC1.9-1.21.5] [![](https://jitpack.io/v/yuttyann/ScriptBlockPlus.svg)](https://jitpack.io/#yuttyann/ScriptBlockPlus)
 ==========
 
 概要
@@ -27,7 +27,8 @@
 **== 各バージョンの動作範囲 ==**
 | Plugin | Server | Java |
 |:---|:---|:---:|
-|**`2.3.0-2.3.2`**|**`1.9-1.21`**|**Java11**|
+|**`2.3.3`**|**`1.9-1.21.5`**|**Java11**|
+|`2.3.0-2.3.2`|`1.9-1.21`|**Java11**|
 |`2.2.7-2.2.8`|`1.9-1.20.2`|**Java11**|
 |`2.2.6`|`1.9-1.20.1`|**Java11**|
 |`2.2.5`|`1.9-1.19.3`|**Java11**|

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.yuttyann</groupId>
   <artifactId>ScriptBlockPlus</artifactId>
-  <version>2.3.2</version>
+  <version>2.3.3</version>
 
   <name>ScriptBlockPlus</name>
   <url>https://github.com/yuttyann/ScriptBlockPlus</url>
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.20.1-R0.1-SNAPSHOT</version>
+      <version>1.21.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -164,7 +164,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>[2.8.9,)</version>
+      <version>2.8.9</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

src/main/java/com/github/yuttyann/scriptblockplus/file/Backup.java

@@ -31,7 +31,7 @@
 import com.google.common.base.Predicates;
 
 /**
- * FBS-Common Backup
+ * Corelate-Common Backup
  * @author yuttyann44581
  */
 public class Backup extends SimpleFileVisitor<Path> {

src/main/java/com/github/yuttyann/scriptblockplus/hook/nms/AnvilGUI.java

@@ -38,6 +38,7 @@
 import org.bukkit.inventory.AnvilInventory;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.view.AnvilView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -210,7 +211,7 @@ private void openInventory() {
      * @author yuttyann44581
      */
     private class AnvilListener implements Listener {
-    
+
         @EventHandler(priority = EventPriority.LOW)
         public void onPrepareAnvil(PrepareAnvilEvent event) {
             if (!event.getInventory().equals(inventory)) {
@@ -224,7 +225,9 @@ public void onPrepareAnvil(PrepareAnvilEvent event) {
             if (McVersion.V_1_16_2.isUnSupported() && StringUtils.isNotEmpty(text) && text.startsWith("§") && name.length() > 0) {
                 ItemUtils.setName(output, name.substring(1));
             }
-            if (McVersion.V_1_11.isSupported()) {
+            if (McVersion.V_1_12.isSupported()) {
+                ScriptBlock.getScheduler().run(() -> ((AnvilView) inventory).setRepairCost(0));
+            } else if (McVersion.V_1_11.isSupported()) {
                 ScriptBlock.getScheduler().run(() -> ((AnvilInventory) inventory).setRepairCost(0));
             }
             if (update != null) {

src/main/java/com/github/yuttyann/scriptblockplus/item/action/TickRunnable.java

@@ -55,6 +55,16 @@
  */
 public class TickRunnable extends BukkitRunnable {
 
+    private static Particle DUST;
+
+    static {
+        try {
+            DUST = Particle.valueOf("REDSTONE");
+        } catch (Exception ex) {
+            DUST = Particle.valueOf("DUST");
+        }
+    }
+
     private static final int PLAYER_RANGE = 15;
     private static final int PARTICLE_RANGE = 10;
     private static final int PARTICLE_LIMIT = 800;
@@ -231,26 +241,26 @@ public static void spawnParticlesOnBlock(@NotNull Player player, @NotNull Block
         double x = block.getX(), y = block.getY(), z = block.getZ(), a = 1D;
         if (V_1_13.isSupported()) {
             var dust = new DustOptions(color, 1);
-            player.spawnParticle(Particle.REDSTONE, x, y, z, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x + a, y, z, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x + a, y, z + a, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x, y, z + a, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x, y + a, z, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x + a, y + a, z, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x + a, y + a, z + a, 0, 0, 0, 0, dust);
-            player.spawnParticle(Particle.REDSTONE, x, y + a, z + a, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x, y, z, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x + a, y, z, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x + a, y, z + a, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x, y, z + a, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x, y + a, z, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x + a, y + a, z, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x + a, y + a, z + a, 0, 0, 0, 0, dust);
+            player.spawnParticle(DUST, x, y + a, z + a, 0, 0, 0, 0, dust);
         } else {
             double r = (color.getRed() - 0.0001) / 255D;
             double g = (color.getGreen() - 0.0001) / 255D;
             double b = (color.getBlue() - 0.0001) / 255D;
-            player.spawnParticle(Particle.REDSTONE, x, y, z, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x + a, y, z, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x + a, y, z + a, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x, y, z + a, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x, y + a, z, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x + a, y + a, z, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x + a, y + a, z + a, 0, r, g, b, 1);
-            player.spawnParticle(Particle.REDSTONE, x, y + a, z + a, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x, y, z, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x + a, y, z, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x + a, y, z + a, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x, y, z + a, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x, y + a, z, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x + a, y + a, z, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x + a, y + a, z + a, 0, r, g, b, 1);
+            player.spawnParticle(DUST, x, y + a, z + a, 0, r, g, b, 1);
         }
     }
 }

src/main/java/com/github/yuttyann/scriptblockplus/item/gui/GUIItem.java

@@ -98,7 +98,7 @@ public GUIItem(final boolean enchant, final int amount, @NotNull Material materi
         }
         itemMeta.addItemFlags(FLAGS);
         if (enchant) {
-            itemMeta.addEnchant(Enchantment.LOOT_BONUS_BLOCKS, 1, false);
+            itemMeta.addEnchant(Enchantment.EFFICIENCY, 1, false);
         }
         if (name != null) {
             itemMeta.setDisplayName("§r" + name);
@@ -167,9 +167,9 @@ public TriConsumer<UserWindow, GUIItem, ClickType> getClicked() {
     public GUIItem setEnchant(final boolean enchant) {
         var itemMeta = item.getItemMeta();
         if (enchant) {
-            itemMeta.addEnchant(Enchantment.LOOT_BONUS_BLOCKS, 1, false);
+            itemMeta.addEnchant(Enchantment.EFFICIENCY, 1, false);
         } else {
-            itemMeta.removeEnchant(Enchantment.LOOT_BONUS_BLOCKS);
+            itemMeta.removeEnchant(Enchantment.EFFICIENCY);
         }
         item.setItemMeta(itemMeta);
         return this;

src/main/java/com/github/yuttyann/scriptblockplus/utils/server/CraftBukkit.java

@@ -22,7 +22,7 @@
 import com.github.yuttyann.scriptblockplus.utils.version.McVersion;
 
 /**
- * FBS-Bukkit CraftBukkit
+ * Corelate-Bukkit CraftBukkit
  * @see McVersion#V_1_21_1
  * @author yuttyann44581
  */

src/main/java/com/github/yuttyann/scriptblockplus/utils/server/NetMinecraft.java

@@ -21,7 +21,7 @@
 import com.github.yuttyann.scriptblockplus.utils.version.McVersion;
 
 /**
- * FBS-Bukkit NetMinecraft
+ * Corelate-Bukkit NetMinecraft
  * @see McVersion#V_1_21_1
  * @author yuttyann44581
  */

src/main/java/com/github/yuttyann/scriptblockplus/utils/server/minecraft/Minecraft.java

@@ -29,7 +29,7 @@
 import org.springframework.lang.NonNull;
 
 /**
- * FBS-Bukkit Minecraft
+ * Corelate-Bukkit Minecraft
  * @author yuttyann44581
  */
 public final class Minecraft {
@@ -45,7 +45,7 @@ public static void setAccessor(@NonNull NativeAccessor accessor) {
     public static void sendAllPacket(@NotNull Object packet) throws ReflectiveOperationException {
         accessor.sendAllPacket(packet);
     }
-    
+
     public static void sendAllPackets(@NotNull Object... packets) throws ReflectiveOperationException {
         accessor.sendAllPackets(packets);
     }
@@ -124,7 +124,7 @@ public static List<Entity> getEntities(@NotNull CommandSender sender, @NotNull V
     public static Object newVec3(double x, double y, double z) throws ReflectiveOperationException {
         return accessor.newVec3(x, y, z);
     }
-    
+
     @NotNull
     public static Object newAnvilMenu(@NotNull Object serverPlayer, @NotNull Object serverLevel, @NotNull Object title) throws ReflectiveOperationException {
         return accessor.newAnvilMenu(serverPlayer, serverLevel, title);