Update dependencies to 1.21.1 (#1394)

Signed-off-by: Pablo Herrera <[email protected]>

platform/platform-modern/pom.xml

@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.papermc.paper</groupId>
       <artifactId>paper-api</artifactId>
-      <version>1.21-R0.1-SNAPSHOT</version>
+      <version>1.21.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.papermc.paper</groupId>
       <artifactId>paper</artifactId>
-      <version>1.21-R0.1-SNAPSHOT</version>
+      <version>1.21.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 

platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/ModernInventoryUtil.java

@@ -23,7 +23,7 @@
 import tc.oc.pgm.util.inventory.InventoryUtils;
 import tc.oc.pgm.util.platform.Supports;
 
-@Supports(value = PAPER, minVersion = "1.20.6")
+@Supports(value = PAPER, minVersion = "1.21.1")
 public class ModernInventoryUtil implements InventoryUtils.InventoryUtilsPlatform {
 
   @Override
@@ -80,24 +80,26 @@ public EquipmentSlot getUsedHand(PlayerEvent event) {
   }
 
   @Override
-  public void setCanDestroy(ItemMeta itemMeta, Collection<Material> materials) {
-    // TODO: PLATFORM 1.20 no support for can place/destroy
+  @SuppressWarnings("removal")
+  public void setCanDestroy(ItemMeta itemMeta, Set<Material> materials) {
+    itemMeta.setCanDestroy(materials);
   }
 
   @Override
+  @SuppressWarnings("removal")
   public Set<Material> getCanDestroy(ItemMeta itemMeta) {
-    // TODO: PLATFORM 1.20 no support for can place/destroy
-    return Collections.emptySet();
+    return itemMeta.getCanDestroy();
   }
 
   @Override
-  public void setCanPlaceOn(ItemMeta itemMeta, Collection<Material> materials) {
-    // TODO: PLATFORM 1.20 no support for can place/destroy
+  @SuppressWarnings("removal")
+  public void setCanPlaceOn(ItemMeta itemMeta, Set<Material> materials) {
+    itemMeta.setCanPlaceOn(materials);
   }
 
   @Override
+  @SuppressWarnings("removal")
   public Set<Material> getCanPlaceOn(ItemMeta itemMeta) {
-    // TODO: PLATFORM 1.20 no support for can place/destroy
-    return Collections.emptySet();
+    return itemMeta.getCanPlaceOn();
   }
 }

platform/platform-sportpaper/src/main/java/tc/oc/pgm/platform/sportpaper/SpInventoryUtil.java

@@ -73,7 +73,7 @@ public EquipmentSlot getUsedHand(PlayerEvent event) {
   }
 
   @Override
-  public void setCanDestroy(ItemMeta itemMeta, Collection<Material> materials) {
+  public void setCanDestroy(ItemMeta itemMeta, Set<Material> materials) {
     itemMeta.setCanDestroy(materials);
   }
 
@@ -83,7 +83,7 @@ public Set<Material> getCanDestroy(ItemMeta itemMeta) {
   }
 
   @Override
-  public void setCanPlaceOn(ItemMeta itemMeta, Collection<Material> materials) {
+  public void setCanPlaceOn(ItemMeta itemMeta, Set<Material> materials) {
     itemMeta.setCanPlaceOn(materials);
   }
 

pom.xml

@@ -94,7 +94,7 @@
         <dependency>
             <groupId>dev.pgm.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.8_1.21-SNAPSHOT</version>
+            <version>1.8_1.21.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -164,7 +164,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.3</version>
+            <version>4.3.4</version>
             <scope>compile</scope>
             <!-- Exclude Spigot APIs since we already provide Bukkit -->
             <exclusions>

util/src/main/java/tc/oc/pgm/util/collection/DefaultMapAdapter.java

@@ -58,29 +58,16 @@ public DefaultMapAdapter(Function<? super K, ? extends V> defaultProvider) {
 
   @Override
   public V get(Object key) {
-    V value = this.map.get(key);
-    if (value == null) {
-      value = this.defaultProvider.apply((K) key);
-      if (this.putDefault) this.map.put((K) key, value);
-    }
-    return value;
+    return this.putDefault ? getOrCreate((K) key) : getOrDefault((K) key);
   }
 
   public V getOrDefault(K key) {
     V value = this.map.get(key);
-    if (value == null) {
-      value = this.defaultProvider.apply(key);
-    }
-    return value;
+    return value != null ? value : this.defaultProvider.apply((K) key);
   }
 
   public V getOrCreate(K key) {
-    V value = this.map.get(key);
-    if (value == null) {
-      value = this.defaultProvider.apply(key);
-      this.map.put(key, value);
-    }
-    return value;
+    return this.map.computeIfAbsent(key, this.defaultProvider);
   }
 
   public V getOrNull(K key) {

util/src/main/java/tc/oc/pgm/util/inventory/InventoryUtils.java

@@ -171,10 +171,6 @@ public static void consumeItem(PlayerEvent player) {
   public interface InventoryUtilsPlatform {
     Collection<PotionEffect> getPotionEffects(ItemStack item);
 
-    default boolean isUnbreakable(ItemStack item) {
-      return isUnbreakable(item.getItemMeta());
-    }
-
     boolean isUnbreakable(ItemMeta item);
 
     default void setUnbreakable(ItemStack item, boolean unbreakable) {
@@ -194,11 +190,11 @@ void applyAttributeModifiers(
 
     EquipmentSlot getUsedHand(PlayerEvent event);
 
-    void setCanDestroy(ItemMeta itemMeta, Collection<Material> materials);
+    void setCanDestroy(ItemMeta itemMeta, Set<Material> materials);
 
     Set<Material> getCanDestroy(ItemMeta itemMeta);
 
-    void setCanPlaceOn(ItemMeta itemMeta, Collection<Material> materials);
+    void setCanPlaceOn(ItemMeta itemMeta, Set<Material> materials);
 
     Set<Material> getCanPlaceOn(ItemMeta itemMeta);
   }