Post-merge fixes

src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java

@@ -3,6 +3,7 @@ package appeng.data.providers.tags;
 import java.io.IOException;
 import java.nio.file.Path;
 
+import appeng.core.Api;
 import net.minecraft.block.Blocks;
 import net.minecraft.item.Items;
 
@@ -40,8 +41,9 @@ public class ConventionTagProvider extends TagProvider {
         addItemTag("gold_ores", Items.GOLD_ORE);
         addItemTag("glowstone_dusts", Items.GLOWSTONE_DUST);
         addItemTag("wooden_rods", Items.STICK);
-        addItemTag("nether_quartz_ores", Items.NETHER_QUARTZ_ORE);
-        addItemTag("nether_quartz_crystals", Items.QUARTZ);
+        addItemTag("quartz_dusts", MATERIALS.netherQuartzDust());
+        addItemTag("quartz_ores", Items.NETHER_QUARTZ_ORE);
+        addItemTag("quartz", Items.QUARTZ);
         addItemTag("sand_blocks", Items.SAND, Items.RED_SAND);
         addItemTag("diamonds", Items.DIAMOND);
         addItemTag("wooden_chests", Items.CHEST, Items.TRAPPED_CHEST);

src/main/java/appeng/core/AppEngBase.java

@@ -101,6 +101,7 @@ import appeng.worldgen.BiomeModifier;
 import appeng.worldgen.ChargedQuartzOreConfig;
 import appeng.worldgen.ChargedQuartzOreFeature;
 import appeng.worldgen.meteorite.MeteoriteStructure;
+import appeng.worldgen.meteorite.MeteoriteStructurePiece;
 import net.earthcomputer.libstructure.LibStructure;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
@@ -548,6 +549,8 @@ public abstract class AppEngBase implements AppEng {
     }
 
     private void registerWorldGen() {
+        MeteoriteStructurePiece.register();
+
         LibStructure.registerStructure(MeteoriteStructure.ID, MeteoriteStructure.INSTANCE,
                 GenerationStep.Feature.TOP_LAYER_MODIFICATION, new StructureConfig(32, 8, 124895654),
                 new MeteoriteStructure(DefaultFeatureConfig.CODEC).configure(DefaultFeatureConfig.INSTANCE));

src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json

@@ -1,7 +1,7 @@
 {
   "type": "appliedenergistics2:grinder",
   "input": {
-    "tag": "c:nether_quartz_crystals"
+    "tag": "c:quartz"
   },
   "result": {
     "primary": {

src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json

@@ -1,7 +1,7 @@
 {
   "type": "appliedenergistics2:grinder",
   "input": {
-    "tag": "c:nether_quartz_ores"
+    "tag": "c:quartz_ores"
   },
   "result": {
     "primary": {

src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json

@@ -3,7 +3,7 @@
   "result": "appliedenergistics2:silicon",
   "ingredient": [
     {
-      "tag": "forge:dusts/quartz"
+      "tag": "c:dusts/quartz"
     },
     {
       "tag": "appliedenergistics2:dusts/certus_quartz"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json

@@ -6,7 +6,7 @@
   "pattern": ["aa", "ab", " b"],
   "key": {
     "a": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     },
     "b": {
       "tag": "c:wooden_rods"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json

@@ -9,7 +9,7 @@
       "tag": "c:iron_ingots"
     },
     "c": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     },
     "a": {
       "tag": "c:wooden_rods"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json

@@ -6,7 +6,7 @@
   "pattern": ["aa", " b", " b"],
   "key": {
     "a": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     },
     "b": {
       "tag": "c:wooden_rods"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json

@@ -6,7 +6,7 @@
   "pattern": ["aaa", " b ", " b "],
   "key": {
     "a": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     },
     "b": {
       "tag": "c:wooden_rods"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json

@@ -6,7 +6,7 @@
   "pattern": ["a", "b", "b"],
   "key": {
     "a": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     },
     "b": {
       "tag": "c:wooden_rods"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json

@@ -6,7 +6,7 @@
   "pattern": ["a", "a", "b"],
   "key": {
     "a": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     },
     "b": {
       "tag": "c:wooden_rods"

src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json

@@ -6,7 +6,7 @@
   "pattern": ["a a", " a ", "a a"],
   "key": {
     "a": {
-      "tag": "c:nether_quartz_crystals"
+      "tag": "c:quartz"
     }
   }
 }

src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "#c:nether_quartz_crystals",
+    "#c:quartz",
     "appliedenergistics2:purified_nether_quartz_crystal"
   ]
 }

src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "#c:nether_quartz_crystals",
+    "#c:quartz",
     "#appliedenergistics2:crystals/certus_quartz",
     "appliedenergistics2:charged_certus_quartz_crystal"
   ]