Remove some missed deprecations (#1686)

neoforged · Nov 29, 2024 · d15b815 · d15b815
1 parent 7bfef48
commit d15b815
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 41 deletions.
diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json
@@ -330,7 +330,6 @@
   "tag.item.c.seeds.wheat": "Wheat Seeds",
   "tag.item.c.shulker_boxes": "Shulker Boxes",
   "tag.item.c.slime_balls": "Slimeballs",
-  "tag.item.c.slimeballs": "Slimeballs",
   "tag.item.c.stones": "Stones",
   "tag.item.c.storage_blocks": "Storage Blocks",
   "tag.item.c.storage_blocks.bone_meal": "Bone Meal Storage Blocks",

diff --git a/src/generated/resources/data/c/tags/item/slime_balls.json b/src/generated/resources/data/c/tags/item/slime_balls.json
@@ -1,10 +1,6 @@
 {
   "values": [
     "minecraft:slime_ball",
-    {
-      "id": "#c:slimeballs",
-      "required": false
-    },
     {
       "id": "#forge:slime_balls",
       "required": false

diff --git a/src/generated/resources/data/c/tags/item/slimeballs.json b/src/generated/resources/data/c/tags/item/slimeballs.json
diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java
@@ -613,13 +613,6 @@ public static class Items {
          */
         public static final TagKey<Item> SHULKER_BOXES = tag("shulker_boxes");
         public static final TagKey<Item> SLIME_BALLS = tag("slime_balls");
-        /**
-         * Please use properly named {@link Tags.Items#SLIME_BALLS} tag and field instead
-         * <p></p>
-         * TODO: Remove in 1.21.1
-         */
-        @Deprecated(since = "1.21")
-        public static final TagKey<Item> SLIMEBALLS = tag("slimeballs");
         /**
          * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone.
          */

diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java
@@ -222,8 +222,7 @@ public void addTags(HolderLookup.Provider lookupProvider) {
         tag(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS);
         tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS);
         tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS);
-        tag(Tags.Items.SLIMEBALLS).add(Items.SLIME_BALL); // Deprecated
-        tag(Tags.Items.SLIME_BALLS).add(Items.SLIME_BALL).addOptionalTag(Tags.Items.SLIMEBALLS);
+        tag(Tags.Items.SLIME_BALLS).add(Items.SLIME_BALL);
         tag(Tags.Items.SHULKER_BOXES)
                 .add(Items.SHULKER_BOX).add(Items.WHITE_SHULKER_BOX).add(Items.ORANGE_SHULKER_BOX)
                 .add(Items.MAGENTA_SHULKER_BOX).add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.YELLOW_SHULKER_BOX)

diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java
@@ -304,7 +304,6 @@ protected void addTranslations() {
         add(Tags.Items.SEEDS_WHEAT, "Wheat Seeds");
         add(Tags.Items.SHULKER_BOXES, "Shulker Boxes");
         add(Tags.Items.SLIME_BALLS, "Slimeballs");
-        add(Tags.Items.SLIMEBALLS, "Slimeballs");
         add(Tags.Items.STONES, "Stones");
         add(Tags.Items.STORAGE_BLOCKS, "Storage Blocks");
         add(Tags.Items.STORAGE_BLOCKS_BONE_MEAL, "Bone Meal Storage Blocks");

diff --git a/src/main/java/net/neoforged/neoforge/registries/DeferredRegister.java b/src/main/java/net/neoforged/neoforge/registries/DeferredRegister.java
@@ -170,21 +170,6 @@ public static DataComponents createDataComponents(ResourceKey<Registry<DataCompo
         return new DataComponents(registryKey, modid);
     }
 
-    /**
-     * Factory for a specialized DeferredRegister for {@link DataComponentType DataComponentTypes}.
-     *
-     * @param modid The namespace for all objects registered to this DeferredRegister
-     * @see #create(Registry, String)
-     * @see #create(ResourceKey, String)
-     * @see #create(ResourceLocation, String)
-     * @see #createItems(String)
-     * @deprecated Scheduled for removal in 1.21.2; use {@link DeferredRegister#createDataComponents(ResourceKey, String)} with {@link Registries#DATA_COMPONENT_TYPE} instead
-     */
-    @Deprecated(since = "1.21.1", forRemoval = true)
-    public static DataComponents createDataComponents(String modid) {
-        return new DataComponents(modid);
-    }
-
     private final ResourceKey<? extends Registry<T>> registryKey;
     private final String namespace;
     private final Map<DeferredHolder<T, ? extends T>, Supplier<? extends T>> entries = new LinkedHashMap<>();
@@ -651,12 +636,6 @@ protected DataComponents(ResourceKey<Registry<DataComponentType<?>>> registryKey
             super(registryKey, namespace);
         }
 
-        /** @deprecated Scheduled for removal in 1.21.2; use {@link DataComponents#DataComponents(ResourceKey, String)} */
-        @Deprecated(since = "1.21.1", forRemoval = true)
-        protected DataComponents(String namespace) {
-            super(Registries.DATA_COMPONENT_TYPE, namespace);
-        }
-
         /**
          * Convenience method that constructs a builder for use in the operator. Use this to avoid inference issues.
          *