Merge branch '1.20.x' into 1.20.x

neoforged · Jun 3, 2024 · be4999e · be4999e
2 parents 83ae22e + 4a7d634
commit be4999e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/generated/resources/data/c/tags/blocks/stones.json b/src/generated/resources/data/c/tags/blocks/stones.json
@@ -7,7 +7,7 @@
     "minecraft:deepslate",
     "minecraft:tuff",
     {
-      "id": "#forge:stones",
+      "id": "#forge:stone",
       "required": false
     }
   ]

diff --git a/src/generated/resources/data/c/tags/items/stones.json b/src/generated/resources/data/c/tags/items/stones.json
@@ -7,7 +7,7 @@
     "minecraft:deepslate",
     "minecraft:tuff",
     {
-      "id": "#forge:stones",
+      "id": "#forge:stone",
       "required": false
     }
   ]

diff --git a/src/main/java/net/neoforged/neoforge/common/EffectCure.java b/src/main/java/net/neoforged/neoforge/common/EffectCure.java
@@ -35,7 +35,7 @@ public final class EffectCure {
      * This collection can be kept around, and will update itself in response to changes to the map.
      * See {@link ConcurrentHashMap#values()} for details.
      */
-    public static Collection<EffectCure> getActions() {
+    public static Collection<EffectCure> getAllCures() {
         return Collections.unmodifiableCollection(CURES.values());
     }
 

diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java
@@ -246,7 +246,7 @@ public void addTags(HolderLookup.Provider p_256380_) {
         tagWithOptionalLegacy(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE);
         tagWithOptionalLegacy(Tags.Blocks.ORES_IN_GROUND_NETHERRACK);
         tagWithOptionalLegacy(Tags.Blocks.ORES_IN_GROUND_STONE);
-        tagWithOptionalLegacy(Tags.Blocks.STONES);
+        tag(Tags.Blocks.STONES).addOptionalTag(new ResourceLocation("forge", "stone"));
         tagWithOptionalLegacy(Tags.Blocks.STORAGE_BLOCKS);
         tagWithOptionalLegacy(Tags.Blocks.STORAGE_BLOCKS_COAL);
         tagWithOptionalLegacy(Tags.Blocks.STORAGE_BLOCKS_COPPER);