Update to 1.20.6 and fix Comet

.github/workflows/build.yml

@@ -9,11 +9,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
     - name: Upload build artifact

pom.xml

@@ -19,13 +19,13 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <properties>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -34,19 +34,19 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.13.0</version>
+                    <version>3.14.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.4.2</version>
                 </plugin>
             </plugins>
         </pluginManagement>

src/main/java/com/klin/holoItems/Events.java

@@ -83,37 +83,37 @@ public class Events implements Listener {
     );
     private final Map<Integer, Enchantment[]> multiplier = new HashMap<>() {{
         put(1, new Enchantment[]{
-                Enchantment.PROTECTION_ENVIRONMENTAL, Enchantment.DAMAGE_ALL,
-                Enchantment.DIG_SPEED, Enchantment.ARROW_DAMAGE,
+                Enchantment.PROTECTION, Enchantment.SHARPNESS,
+                Enchantment.EFFICIENCY, Enchantment.POWER,
                 Enchantment.LOYALTY, Enchantment.PIERCING
         });
         put(2, new Enchantment[]{
-                Enchantment.PROTECTION_FIRE, Enchantment.PROTECTION_FALL,
-                Enchantment.PROTECTION_PROJECTILE, Enchantment.DAMAGE_UNDEAD,
-                Enchantment.DAMAGE_ARTHROPODS, Enchantment.KNOCKBACK,
-                Enchantment.DURABILITY, Enchantment.QUICK_CHARGE
+                Enchantment.FIRE_PROTECTION, Enchantment.FEATHER_FALLING,
+                Enchantment.PROJECTILE_PROTECTION, Enchantment.SMITE,
+                Enchantment.BANE_OF_ARTHROPODS, Enchantment.KNOCKBACK,
+                Enchantment.UNBREAKING, Enchantment.QUICK_CHARGE
         });
         put(4, new Enchantment[]{
-                Enchantment.PROTECTION_EXPLOSIONS, Enchantment.OXYGEN,
-                Enchantment.DEPTH_STRIDER, Enchantment.WATER_WORKER,
-                Enchantment.FIRE_ASPECT, Enchantment.LOOT_BONUS_MOBS,
-                Enchantment.LOOT_BONUS_BLOCKS, Enchantment.ARROW_KNOCKBACK,
-                Enchantment.ARROW_FIRE, Enchantment.LUCK, Enchantment.LURE,
+                Enchantment.BLAST_PROTECTION, Enchantment.RESPIRATION,
+                Enchantment.DEPTH_STRIDER, Enchantment.AQUA_AFFINITY,
+                Enchantment.FIRE_ASPECT, Enchantment.LOOTING,
+                Enchantment.FORTUNE, Enchantment.PUNCH,
+                Enchantment.FLAME, Enchantment.LUCK_OF_THE_SEA, Enchantment.LURE,
                 Enchantment.FROST_WALKER, Enchantment.MENDING, Enchantment.IMPALING,
                 Enchantment.RIPTIDE, Enchantment.MULTISHOT, Enchantment.SWEEPING_EDGE
         });
         put(8, new Enchantment[]{
-                Enchantment.THORNS, Enchantment.SILK_TOUCH, Enchantment.ARROW_INFINITE,
+                Enchantment.THORNS, Enchantment.SILK_TOUCH, Enchantment.INFINITY,
                 Enchantment.BINDING_CURSE, Enchantment.VANISHING_CURSE,
                 Enchantment.CHANNELING, Enchantment.SOUL_SPEED
         });
     }};
     private final Set<Set<Enchantment>> with = Set.of(
-            Set.of(Enchantment.DAMAGE_ALL, Enchantment.DAMAGE_UNDEAD, Enchantment.DAMAGE_ARTHROPODS),
-            Set.of(Enchantment.PROTECTION_FIRE, Enchantment.PROTECTION_PROJECTILE, Enchantment.PROTECTION_ENVIRONMENTAL, Enchantment.PROTECTION_FALL, Enchantment.PROTECTION_EXPLOSIONS),
+            Set.of(Enchantment.SHARPNESS, Enchantment.SMITE, Enchantment.BANE_OF_ARTHROPODS),
+            Set.of(Enchantment.FIRE_PROTECTION, Enchantment.PROJECTILE_PROTECTION, Enchantment.PROTECTION, Enchantment.FEATHER_FALLING, Enchantment.BLAST_PROTECTION),
             Set.of(Enchantment.DEPTH_STRIDER, Enchantment.FROST_WALKER),
-            Set.of(Enchantment.LOOT_BONUS_BLOCKS, Enchantment.SILK_TOUCH),
-            Set.of(Enchantment.ARROW_INFINITE, Enchantment.MENDING),
+            Set.of(Enchantment.FORTUNE, Enchantment.SILK_TOUCH),
+            Set.of(Enchantment.INFINITY, Enchantment.MENDING),
             Set.of(Enchantment.MULTISHOT, Enchantment.PIERCING)
     );
     private final Map<Enchantment, Set<Enchantment>> exclusive = new HashMap<>(){{

src/main/java/com/klin/holoItems/abstractClasses/SlidingPack.java

@@ -48,7 +48,7 @@ public void ability(InventoryClickEvent event, boolean current){
             return;
         ItemStack selected = event.getCurrentItem();
         ItemMeta selectedMeta = selected.getItemMeta();
-        selectedMeta.addEnchant(Enchantment.LUCK, 1, false);
+        selectedMeta.addEnchant(Enchantment.LUCK_OF_THE_SEA, 1, false);
         selectedMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
         selected.setItemMeta(selectedMeta);
 

src/main/java/com/klin/holoItems/collections/en1/guraCollection/items/Bloop.java

@@ -80,7 +80,7 @@ public void ability(BlockBreakEvent event){
         event.setCancelled(true);
         block.setType(Material.AIR);
         ItemStack pickaxe = player.getInventory().getItemInMainHand();
-        int drops = pickaxe.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS)+1;
+        int drops = pickaxe.getEnchantmentLevel(Enchantment.FORTUNE)+1;
         player.getWorld().dropItemNaturally(block.getLocation(), new ItemStack(Material.QUARTZ_BLOCK, 1+(int)(Math.random()*drops)));
     }
 }

src/main/java/com/klin/holoItems/collections/en1/guraCollection/items/TideRider.java

@@ -28,7 +28,7 @@
 
 public class TideRider extends Item implements Interactable {
     public static final String name = "tideRider";
-    private static final Set<Enchantment> accepted = Set.of(Enchantment.DURABILITY, Enchantment.MENDING);
+    private static final Set<Enchantment> accepted = Set.of(Enchantment.UNBREAKING, Enchantment.MENDING);
 
     private static final Material material = Material.TRIDENT;
     private static final int quantity = 1;

src/main/java/com/klin/holoItems/collections/en1/inaCollection/items/Ingraining.java

@@ -18,7 +18,7 @@
 
 public class Ingraining extends Enchant implements Extractable {
     public static final String name = "ingraining";
-    public static final Set<Enchantment> accepted = Set.of(Enchantment.DURABILITY, Enchantment.MENDING, Enchantment.LOOT_BONUS_BLOCKS);
+    public static final Set<Enchantment> accepted = Set.of(Enchantment.UNBREAKING, Enchantment.MENDING, Enchantment.FORTUNE);
 
     private static final Material material = Material.FLINT;
     private static final String lore =

src/main/java/com/klin/holoItems/collections/en1/inaCollection/items/WateringCan.java

@@ -84,11 +84,11 @@ public void effect(PlayerInteractEvent event){
                     crop.setAge(crop.getAge()+1);
                     block.setBlockData(crop);
 
-                    world.spawnParticle(Particle.VILLAGER_HAPPY, loc, 1, 0.5, 0.5, 0.5);
+                    world.spawnParticle(Particle.HAPPY_VILLAGER, loc, 1, 0.5, 0.5, 0.5);
                 }
             }
         }
-        world.spawnParticle(Particle.WATER_SPLASH, player.getLocation(), 100, 2.5, 0.25, 2.5);
+        world.spawnParticle(Particle.SPLASH, player.getLocation(), 100, 2.5, 0.25, 2.5);
         if(charge==0)
             event.getItem().setType(Material.BUCKET);
     }

src/main/java/com/klin/holoItems/collections/en1/watsonCollection/items/GroundPounder.java

@@ -51,7 +51,7 @@ public GroundPounder(){
 
     public void registerRecipes(){
         ItemMeta meta = item.getItemMeta();
-        meta.addEnchant(Enchantment.DURABILITY, 1, false);
+        meta.addEnchant(Enchantment.UNBREAKING, 1, false);
         List<String> lore = meta.getLore();
         lore.add(0, "");
         meta.setLore(lore);
@@ -175,7 +175,7 @@ public void run(){
                     return;
                 }
                 player.setVelocity(player.getVelocity().add(new Vector(0, -0.2, 0)));
-                player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 2, 3));
+                player.addPotionEffect(new PotionEffect(PotionEffectType.RESISTANCE, 2, 3));
                 increment++;
                 if(increment%5==0)
                     offset++;

src/main/java/com/klin/holoItems/collections/en2/SanaCollection/SanaCollection.java

@@ -45,9 +45,9 @@ public void inquire(Player player, ItemStack itemStack, PlayerInteractEntityEven
         if(enchant!=null && enchant.contains(SpaceBreadSplash.name))
             return;
         Inventory inv = player.getInventory();
-        AtomicBoolean sharp = new AtomicBoolean(itemStack.getEnchantmentLevel(Enchantment.DAMAGE_ALL)>=5);
-        AtomicBoolean smite = new AtomicBoolean(itemStack.getEnchantmentLevel(Enchantment.DAMAGE_UNDEAD)>=5);
-        AtomicBoolean bane = new AtomicBoolean(itemStack.getEnchantmentLevel(Enchantment.DAMAGE_ARTHROPODS)>=5);
+        AtomicBoolean sharp = new AtomicBoolean(itemStack.getEnchantmentLevel(Enchantment.SHARPNESS)>=5);
+        AtomicBoolean smite = new AtomicBoolean(itemStack.getEnchantmentLevel(Enchantment.SMITE)>=5);
+        AtomicBoolean bane = new AtomicBoolean(itemStack.getEnchantmentLevel(Enchantment.BANE_OF_ARTHROPODS)>=5);
         Set<ItemStack> books = new HashSet<>();
         for(ItemStack item : inv.getStorageContents()){
             if(item==null)
@@ -61,19 +61,19 @@ public void inquire(Player player, ItemStack itemStack, PlayerInteractEntityEven
                     if(storedEnchantments.get(enchantment)<5) {
                         cont = true;
                         break;
-                    } if(enchantment.equals(Enchantment.DAMAGE_ALL)) {
+                    } if(enchantment.equals(Enchantment.SHARPNESS)) {
                         if(sharp.get()) {
                             cont = true;
                             break;
                         }
                         found.add(sharp);
-                    } else if(enchantment.equals(Enchantment.DAMAGE_UNDEAD)) {
+                    } else if(enchantment.equals(Enchantment.SMITE)) {
                         if(smite.get()){
                             cont = true;
                             break;
                         }
                         found.add(smite);
-                    } else if(enchantment.equals(Enchantment.DAMAGE_ARTHROPODS)) {
+                    } else if(enchantment.equals(Enchantment.BANE_OF_ARTHROPODS)) {
                         if(bane.get()){
                             cont = true;
                             break;
@@ -96,9 +96,9 @@ public void inquire(Player player, ItemStack itemStack, PlayerInteractEntityEven
                 Utility.addEnchant(itemStack, (SpaceBreadSplash) (Collections.items.get(SpaceBreadSplash.name)));
                 Location loc = event.getRightClicked().getLocation().add(0, 1.4, 0);
                 World world = player.getWorld();
-                world.spawnParticle(Particle.REDSTONE, loc, 4, 1, 1, 1, new Particle.DustOptions(Color.fromBGR(129, 1, 237), 2));
-                world.spawnParticle(Particle.REDSTONE, loc, 4, 1, 1, 1, new Particle.DustOptions(Color.WHITE, 2));
-                world.spawnParticle(Particle.REDSTONE, loc, 4, 1, 1, 1, new Particle.DustOptions(Color.BLUE, 2));
+                world.spawnParticle(Particle.DUST, loc, 4, 1, 1, 1, new Particle.DustOptions(Color.fromBGR(129, 1, 237), 2));
+                world.spawnParticle(Particle.DUST, loc, 4, 1, 1, 1, new Particle.DustOptions(Color.WHITE, 2));
+                world.spawnParticle(Particle.DUST, loc, 4, 1, 1, 1, new Particle.DustOptions(Color.BLUE, 2));
                 player.sendMessage("§a[§dSana§a]§f: §dLimiter REMOVED!");
                 return;
             }

src/main/java/com/klin/holoItems/collections/en2/SanaCollection/items/SpaceBreadSplash.java

@@ -22,7 +22,7 @@ public class SpaceBreadSplash extends Enchant{
 
     public static final Set<String> acceptedIds = Stream.of(Comet.name).collect(Collectors.toCollection(HashSet::new));
     public static final Set<Material> acceptedTypes = null;
-    public static final Set<Enchantment> exclusive = Stream.of(Enchantment.DAMAGE_ALL, Enchantment.DAMAGE_UNDEAD, Enchantment.DAMAGE_ARTHROPODS).collect(Collectors.toCollection(HashSet::new));
+    public static final Set<Enchantment> exclusive = Stream.of(Enchantment.SHARPNESS, Enchantment.SMITE, Enchantment.BANE_OF_ARTHROPODS).collect(Collectors.toCollection(HashSet::new));
     public static final int expCost = 40;
     public static final int cost = -1;
 

src/main/java/com/klin/holoItems/collections/gamers/koroneCollection/items/CircleRenderer.java

@@ -18,7 +18,7 @@ public void render(MapView mapView, MapCanvas mapCanvas, Player player) {
         mapView.setCenterZ(z);
         if(center==null) {
             center = mapCanvas.getCursors().addCursor(0, 0, (byte) 8);
-            center.setType(MapCursor.Type.SMALL_WHITE_CIRCLE);
+            center.setType(MapCursor.Type.PLAYER_OFF_LIMITS); // old "SMALL_WHITE_CIRCLE"
         }
         else{
             center.setX((byte) 0);

src/main/java/com/klin/holoItems/collections/gen0/robocoCollection/items/Magnet.java

@@ -21,7 +21,7 @@
 public class Magnet extends Enchant implements Extractable {
     public static final String name = "magnet";
 
-    public static final Set<Enchantment> accepted = Set.of(Enchantment.DURABILITY, Enchantment.MENDING, Enchantment.SILK_TOUCH);
+    public static final Set<Enchantment> accepted = Set.of(Enchantment.UNBREAKING, Enchantment.MENDING, Enchantment.SILK_TOUCH);
     public static final Set<String> acceptedIds = Stream.of(Comet.name).collect(Collectors.toCollection(HashSet::new));
     public static final Set<Material> acceptedTypes = new HashSet<>();
     public static final int expCost = 39;

src/main/java/com/klin/holoItems/collections/gen0/suiseiCollection/items/Backstab.java

@@ -28,11 +28,11 @@ public class Backstab extends Item implements Interactable{
     public static final String name = "backstab";
     public static final Set<Enchantment> accepted = Set.of(
             Enchantment.FIRE_ASPECT,
-            Enchantment.DAMAGE_ALL,
-            Enchantment.DAMAGE_ARTHROPODS,
-            Enchantment.DAMAGE_UNDEAD,
-            Enchantment.DURABILITY,
-            Enchantment.LOOT_BONUS_MOBS,
+            Enchantment.SHARPNESS,
+            Enchantment.BANE_OF_ARTHROPODS,
+            Enchantment.SMITE,
+            Enchantment.UNBREAKING,
+            Enchantment.LOOTING,
             Enchantment.KNOCKBACK,
             Enchantment.MENDING,
             Enchantment.SWEEPING_EDGE