Update for 1.21

Author: me4502

build.gradle

@@ -99,9 +99,9 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT'
-        compileOnly 'com.sk89q.worldedit:worldedit-core:7.3.1-SNAPSHOT'
-        compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.3.1-SNAPSHOT'
+        compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
+        compileOnly 'com.sk89q.worldedit:worldedit-core:7.3.4-SNAPSHOT'
+        compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.3.4-SNAPSHOT'
         compileOnly 'com.sk89q.worldguard:worldguard-core:7.0.9'
         compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.9'
         compileOnly 'com.github.MilkBowl:VaultAPI:1.7'

src/main/java/com/sk89q/craftbook/bukkit/util/CraftBookBukkitUtil.java

@@ -14,7 +14,6 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
 
-import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -82,7 +81,7 @@ public static Vector3 toVector(org.bukkit.util.Vector vector) {
     }
 
     public static org.bukkit.Location toLocation(World world, Vector3 pt) {
-        return new org.bukkit.Location(world, pt.getX(), pt.getY(), pt.getZ());
+        return new org.bukkit.Location(world, pt.x(), pt.y(), pt.z());
     }
 
     public static org.bukkit.Location center(org.bukkit.Location loc) {
@@ -147,7 +146,6 @@ public static World toWorld(final com.sk89q.worldedit.world.World world) {
         isRedstoneBlock.add(Material.ACTIVATOR_RAIL);
         isRedstoneBlock.add(Material.DROPPER);
         isRedstoneBlock.add(Material.DAYLIGHT_DETECTOR);
-        isRedstoneBlock = EnumSet.copyOf(isRedstoneBlock);
     }
 
     /**

src/main/java/com/sk89q/craftbook/mechanics/ic/gates/world/blocks/Cultivator.java

@@ -17,7 +17,6 @@
 import org.bukkit.block.Chest;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.EnumSet;
 import java.util.Set;
 
 public class Cultivator extends AbstractSelfTriggeredIC {
@@ -78,7 +77,7 @@ public boolean cultivate() {
         return false;
     }
 
-    private static final Set<Material> hoes = EnumSet.of(Material.WOODEN_HOE, Material.STONE_HOE, Material.IRON_HOE, Material.GOLDEN_HOE,
+    private static final Set<Material> hoes = Set.of(Material.WOODEN_HOE, Material.STONE_HOE, Material.IRON_HOE, Material.GOLDEN_HOE,
             Material.DIAMOND_HOE);
 
     public boolean damageHoe() {

src/main/java/com/sk89q/craftbook/mechanics/ic/gates/world/entity/AnimalBreeder.java

@@ -25,7 +25,8 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Collections;
-import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
 
 public class AnimalBreeder extends AbstractSelfTriggeredIC {
 
@@ -81,7 +82,7 @@ public void unload() {
         lastEntity.clear();
     }
 
-    private EnumMap<EntityType, Entity> lastEntity = new EnumMap<>(EntityType.class);
+    private Map<EntityType, Entity> lastEntity = new HashMap<>();
 
     public boolean breed() {
 

src/main/java/com/sk89q/craftbook/mechanics/ic/gates/world/miscellaneous/PotionInducer.java

@@ -1,6 +1,5 @@
 package com.sk89q.craftbook.mechanics.ic.gates.world.miscellaneous;
 
-import java.util.EnumSet;
 import java.util.Set;
 
 import org.bukkit.Server;
@@ -75,7 +74,7 @@ public void load() {
         try {
             types = EntityType.getDetected(RegexUtil.EQUALS_PATTERN.split(getLine(2),2)[1]);
         } catch(Exception e) {
-            types = EnumSet.of(EntityType.PLAYER);
+            types = Set.of(EntityType.PLAYER);
         }
 
         //Converter.

src/main/java/com/sk89q/craftbook/mechanics/ic/gates/world/miscellaneous/SentryGun.java

@@ -24,7 +24,6 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import java.util.EnumSet;
 import java.util.Set;
 
 public class SentryGun extends AbstractSelfTriggeredIC {
@@ -45,7 +44,7 @@ public void load() {
         speed = 0.8f;
         types = EntityType.getDetected(getSign().getLine(2).split(":")[0]);
         if(types == null || types.isEmpty()) {
-            types = EnumSet.of(EntityType.MOB_HOSTILE);
+            types = Set.of(EntityType.MOB_HOSTILE);
         }
         if(getSign().getLine(2).split(":").length > 1)
             speed = Float.parseFloat(getSign().getLine(2).split(":")[1]);

src/main/java/com/sk89q/craftbook/util/EntityType.java

@@ -6,7 +6,7 @@
 import org.bukkit.entity.minecart.RideableMinecart;
 import org.bukkit.entity.minecart.StorageMinecart;
 
-import java.util.EnumSet;
+import java.util.HashSet;
 import java.util.Set;
 
 public enum EntityType {
@@ -67,7 +67,7 @@ public char getCharName() {
 
     public static Set<EntityType> getDetected(String line) {
 
-        Set<EntityType> types = EnumSet.noneOf(EntityType.class);
+        Set<EntityType> types = new HashSet<>();
 
         if (line.trim().isEmpty()) {
             types.add(ANY);