Use forRemoval further, and add the extra suppressions necessary due …

…to this
EngineHub · Apr 24, 2024 · 0c91194 · 0c91194
1 parent 396d93a
commit 0c91194
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemRegistry.java
@@ -24,7 +24,7 @@
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.registry.BundledItemRegistry;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings("removal")
 class BukkitItemRegistry extends BundledItemRegistry {
     @Override
     public Component getRichName(ItemType itemType) {

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
@@ -110,7 +110,7 @@ public BlockType getBlockType() {
      * @return The material
      * @deprecated Deprecated without alternative
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @SuppressWarnings("removal")
     public ItemMaterial getMaterial() {
         return itemMaterial.getValue();

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemData.java
@@ -49,7 +49,7 @@
  *
  * @deprecated Deprecated without replacement.
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 public final class BundledItemData {
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
@@ -111,7 +111,7 @@ public ItemEntry findById(String id) {
      * @deprecated Deprecated without alternative
      */
     @Nullable
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @SuppressWarnings("removal")
     public ItemMaterial getMaterialById(String id) {
         ItemEntry entry = findById(id);

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
@@ -33,14 +33,16 @@
  *
  * @deprecated Use the platform Item Registries
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 public class BundledItemRegistry implements ItemRegistry {
 
+    @SuppressWarnings("removal")
     private BundledItemData.ItemEntry getEntryById(ItemType itemType) {
         return BundledItemData.getInstance().findById(itemType.id());
     }
 
     @Override
+    @SuppressWarnings("removal")
     public Component getRichName(ItemType itemType) {
         BundledItemData.ItemEntry itemEntry = getEntryById(itemType);
         if (itemEntry != null && !itemEntry.localizedName.equals("Air")) {
@@ -59,7 +61,7 @@ public Component getRichName(ItemType itemType) {
     @Override
     @Deprecated
     // dumb_intellij.jpg
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings({"deprecation", "removal"})
     public String getName(ItemType itemType) {
         BundledItemData.ItemEntry itemEntry = getEntryById(itemType);
         if (itemEntry != null) {
@@ -76,7 +78,7 @@ public String getName(ItemType itemType) {
 
     @Nullable
     @Override
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @SuppressWarnings("removal")
     public ItemMaterial getMaterial(ItemType itemType) {
         return new PassthroughItemMaterial(BundledItemData.getInstance().getMaterialById(itemType.id()));

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledRegistries.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledRegistries.java
@@ -70,7 +70,7 @@ static URL loadRegistry(String name) throws IOException {
     }
 
     private final BundledBlockRegistry blockRegistry = new BundledBlockRegistry();
-    @SuppressWarnings("deprecation")
+    @SuppressWarnings("removal")
     private final BundledItemRegistry itemRegistry = new BundledItemRegistry();
     private final NullEntityRegistry entityRegistry = new NullEntityRegistry();
     private final NullBiomeRegistry biomeRegistry = new NullBiomeRegistry();

diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricItemRegistry.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricItemRegistry.java
@@ -25,7 +25,7 @@
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.registry.BundledItemRegistry;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings("removal")
 public class FabricItemRegistry extends BundledItemRegistry {
 
     @Override

diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeItemRegistry.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeItemRegistry.java
@@ -25,7 +25,7 @@
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.registry.BundledItemRegistry;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings("removal")
 public class ForgeItemRegistry extends BundledItemRegistry {
 
     @Override

diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeItemRegistry.java
@@ -29,7 +29,7 @@
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.RegistryTypes;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings("removal")
 public class SpongeItemRegistry extends BundledItemRegistry {
 
     @Override