From 65e8748fc6ce6cf2b5b06b6e7943beabf269a247 Mon Sep 17 00:00:00 2001
From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com>
Date: Thu, 30 May 2024 23:31:58 -0400
Subject: [PATCH] Fix `c:stones`'s backwards compat with `forge:stone` (#1042)

---
 src/generated/resources/data/c/tags/blocks/stones.json          | 2 +-
 src/generated/resources/data/c/tags/items/stones.json           | 2 +-
 .../common/data/internal/NeoForgeBlockTagsProvider.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/generated/resources/data/c/tags/blocks/stones.json b/src/generated/resources/data/c/tags/blocks/stones.json
index 820387926d..2848998459 100644
--- 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
index 820387926d..2848998459 100644
--- 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/data/internal/NeoForgeBlockTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeBlockTagsProvider.java
index aa6350ba9f..bd80c912c5 100644
--- 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);