Fixed missing blocks

src/generated/resources/.cache/cache

@@ -692,17 +692,17 @@ c2007ccbbcf13da8b0786e246700b378c2186e2f data/actuallyadditions/advancements/rec
 9c4253847f7dbe9f2c7817c7a7a63a820883b671 data/actuallyadditions/loot_tables/blocks/atomic_reconstructor_block.json
 d5c713abb08903b0dbe44e8ec40d28178f7b6af3 data/actuallyadditions/loot_tables/blocks/battery_box_block.json
 22d4a4f89b800c8c44cf034d42da8a18e3a8f22a data/actuallyadditions/loot_tables/blocks/bio_reactor_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_slab_block.json
+5c4d72607b2e7424c0984a3e038b772635200b2a data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_slab_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_stair_block.json
+7ac90d0702e675e96b4015095ce23914934b0866 data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_stair_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_slab_block.json
+7c54821245407215cf55ad68ddb5aeab0241c035 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_slab_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_stair_block.json
+ef95befe02fb8c0e8d59653fd3fd17fe8d7f0ff7 data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_stair_block.json
 a1b62291e361451916e45a97bb499ecb1b6eb595 data/actuallyadditions/loot_tables/blocks/black_quartz_block.json
 362e5acf99d6fd818735884a28322a8e91c8ba4b data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_block.json
 48eac04ab390a96688de5a22cb741b347a79a712 data/actuallyadditions/loot_tables/blocks/black_quartz_chiseled_wall_block.json
 284190bea6fa9fefeeb5aa942830fbd8999a4446 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json
 7425767821419cbc76822f15d5ece7d6bf10dd3b data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_slab_block.json
+76dcb61af7d7c50dddc802041e820e1045d20618 data/actuallyadditions/loot_tables/blocks/black_quartz_slab_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/black_quartz_stair_block.json
+1101f6ac123e4fb671226b87d5d81855b0f8787c data/actuallyadditions/loot_tables/blocks/black_quartz_stair_block.json
 88b25da9974bf7c4e70133fea626e8e38e5f5b2e data/actuallyadditions/loot_tables/blocks/black_quartz_wall_block.json
 cfcd716a6511dc3f4cbe808e1d6f6cb400b7bfe6 data/actuallyadditions/loot_tables/blocks/breaker_block.json
 060b79c85d98a522bf8705a812f98cd7d276c5a6 data/actuallyadditions/loot_tables/blocks/canola_press_block.json
@@ -750,8 +750,8 @@ cd12bb6fd2bac95b52f499abff26176d816e769c data/actuallyadditions/loot_tables/bloc
 0c8d2932da0aa5f98bbc6866f9fce9f9fab1d0ca data/actuallyadditions/loot_tables/blocks/fluid_placer_block.json
 c7f9b70323a62adc32c0dfb510befdbd52308b84 data/actuallyadditions/loot_tables/blocks/fluids_laser_relay_block.json
 a6263d5353b4f28e60d5473bf10d5fd386ad0f45 data/actuallyadditions/loot_tables/blocks/green_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/green_slab_block.json
+7c813af5aa4077d5b94213b9c9c1044423acd50b data/actuallyadditions/loot_tables/blocks/green_slab_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/green_stairs_block.json
+1c7d821b543d88a8759181987d4fd63b15039b03 data/actuallyadditions/loot_tables/blocks/green_stairs_block.json
 e906482728edba1b6ec15f3313c0b0b9ceb38526 data/actuallyadditions/loot_tables/blocks/green_wall_block.json
 34dde314aa80e313627ca49d9624ab4bed34421f data/actuallyadditions/loot_tables/blocks/greenhouse_glass_block.json
 c093309adf18eae12b6af39266f99e013141f233 data/actuallyadditions/loot_tables/blocks/heat_collector_block.json
@@ -796,8 +796,8 @@ af7dc901bd5a58ee7f434e1da874f456fa18db81 data/actuallyadditions/loot_tables/bloc
 7a2c663f711b890668a6a5c120b47e254ccfcf35 data/actuallyadditions/loot_tables/blocks/shock_suppressor_block.json
 66ef838b2229cbb1be9212d32abe64d64ce58e5e data/actuallyadditions/loot_tables/blocks/tiny_torch_block.json
 75dfef891a53e3a69cb77123d097df207d3b312a data/actuallyadditions/loot_tables/blocks/white_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/white_slab_block.json
+95c835269659b1873a64425c85231ab5a207c3a4 data/actuallyadditions/loot_tables/blocks/white_slab_block.json
-205f5899101262f31f5c1a88bb7d954918d08d04 data/actuallyadditions/loot_tables/blocks/white_stairs_block.json
+8331999b3a5e2c17a4b1e18d0c2f854dc38d47d7 data/actuallyadditions/loot_tables/blocks/white_stairs_block.json
 05edfaaa6f2af2eb141be1a879b9f793dcfff2b5 data/actuallyadditions/loot_tables/blocks/white_wall_block.json
 f50671e462968cd65feaba0bdb5bee54d14e4b24 data/actuallyadditions/loot_tables/blocks/wood_casing_block.json
 cb45575707d43736601e5dfa43ef83e413bc8f66 data/actuallyadditions/loot_tables/blocks/xp_solidifier_block.json

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_slab_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:black_chiseled_quartz_slab_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_chiseled_quartz_stair_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:black_chiseled_quartz_stair_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_slab_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:black_pillar_quartz_slab_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_pillar_quartz_stair_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:black_pillar_quartz_stair_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_slab_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:black_quartz_slab_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_stair_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:black_quartz_stair_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/green_slab_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:green_slab_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/green_stairs_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:green_stairs_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/white_slab_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:white_slab_block"
         }
       ],
       "conditions": [

src/generated/resources/data/actuallyadditions/loot_tables/blocks/white_stairs_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "minecraft:air"
+          "name": "actuallyadditions:white_stairs_block"
         }
       ],
       "conditions": [

src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlock.java

@@ -2,9 +2,14 @@ package de.ellpeck.actuallyadditions.common.blocks;
 
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.block.StairsBlock;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 
+import java.util.function.Supplier;
+
 /**
  * Using a custom class here to declare common rules between all of our blocks.
  * This also provides a simple instance of check for our blocks.
@@ -25,4 +30,36 @@ public class ActuallyBlock extends Block implements IActuallyBlock {
     public Item.Properties getItemProperties() {
         return new Item.Properties().group(ActuallyAdditions.ACTUALLY_GROUP);
     }
+
+    public static class Stairs extends StairsBlock implements IActuallyBlock {
+        public Stairs(Supplier<BlockState> state, Properties properties) {
+            super(state, properties);
+        }
+
+        @Override
+        public BlockItem createBlockItem() {
+            return new BlockItem(this, this.getItemProperties());
+        }
+
+        @Override
+        public Item.Properties getItemProperties() {
+            return new Item.Properties().group(ActuallyAdditions.ACTUALLY_GROUP);
+        }
+    }
+
+    public static class Slabs extends SlabBlock implements IActuallyBlock {
+        public Slabs(Properties properties) {
+            super(properties);
+        }
+
+        @Override
+        public BlockItem createBlockItem() {
+            return new BlockItem(this, this.getItemProperties());
+        }
+
+        @Override
+        public Item.Properties getItemProperties() {
+            return new Item.Properties().group(ActuallyAdditions.ACTUALLY_GROUP);
+        }
+    }
 }

src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java

@@ -113,10 +113,10 @@ public class ActuallyBlocks {
     // BUILDING BLOCKS
     public static final RegistryObject<Block> GREEN_BLOCK = BLOCKS.register("green_block", GenericBlock::new);
     public static final RegistryObject<Block> WHITE_BLOCK = BLOCKS.register("white_block", GenericBlock::new);
-    public static final RegistryObject<Block> GREEN_STAIRS = BLOCKS.register("green_stairs_block", () -> new StairsBlock(() -> GREEN_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> GREEN_STAIRS = BLOCKS.register("green_stairs_block", () -> new ActuallyBlock.Stairs(() -> GREEN_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> WHITE_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new ActuallyBlock.Stairs(() -> WHITE_BLOCK.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> GREEN_WALL = BLOCKS.register("green_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK)));
     public static final RegistryObject<Block> WHITE_WALL = BLOCKS.register("white_wall_block", () -> new WallBlock(Block.Properties.create(Material.ROCK)));
 
@@ -127,12 +127,12 @@ public class ActuallyBlocks {
     public static final RegistryObject<Block> BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get())));
     public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_quartz_chiseled_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get())));
     public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_quartz_pillar_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get())));
-    public static final RegistryObject<Block> BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_STAIR = BLOCKS.register("black_pillar_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_STAIR = BLOCKS.register("black_pillar_quartz_stair_block", () -> new ActuallyBlock.Stairs(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_SLAB = BLOCKS.register("black_chiseled_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> BLACK_CHISELED_QUARTZ_SLAB = BLOCKS.register("black_chiseled_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK)));
-    public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_SLAB = BLOCKS.register("black_pillar_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK)));
+    public static final RegistryObject<Block> BLACK_PILLAR_QUARTZ_SLAB = BLOCKS.register("black_pillar_quartz_slab_block", () -> new ActuallyBlock.Slabs(Block.Properties.create(Material.ROCK)));
 
     // LAMPS! SO MANY LAMPS
     public static final RegistryObject<Block> LAMP_WHITE = BLOCKS.register("lamp_white_block", LampBlock::new);

src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java

@@ -48,7 +48,7 @@ public final class ActuallyItems {
     public static final Set<ToolSet> ALL_TOOL_SETS = ImmutableSet.of(QUARTZ_SET, ENORI_SET, EMERADIC_SET, VOID_SET, DIAMATINE_SET, PALIS_SET, RESTONIA_SET);
 
     // Resources
-    public static final RegistryObject<Item> BLACK_QUARTS = ITEMS.register("black_quartz", basicItem());
+    public static final RegistryObject<Item> BLACK_QUARTZ = ITEMS.register("black_quartz", basicItem());
 
     public static final RegistryObject<Item> RESTONIA_CRYSTAL = ITEMS.register("restonia_crystal", basicItem());
     public static final RegistryObject<Item> PALIS_CRYSTAL = ITEMS.register("palis_crystal", basicItem());
@@ -215,7 +215,7 @@ public final class ActuallyItems {
 
     public static final Set<RegistryObject<Item>> SIMPLE_ITEMS = ImmutableSet.of(
             // Crystals
-            BLACK_QUARTS, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL,
+            BLACK_QUARTZ, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL,
             VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL, RESTONIA_EMPOWERED_CRYSTAL,
             PALIS_EMPOWERED_CRYSTAL, DIAMATINE_EMPOWERED_CRYSTAL, VOID_EMPOWERED_CRYSTAL, EMERADIC_EMPOWERED_CRYSTAL,
             ENORI_EMPOWERED_CRYSTAL,

src/main/java/de/ellpeck/actuallyadditions/common/materials/ArmorMaterials.java

@@ -22,7 +22,7 @@ public enum ArmorMaterials implements IArmorMaterial {
 //    EMERALD("emerald_armor_material", 30,  new int[] { 5, 8, 9, 4 }, 15, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 2, 0f, () -> Ingredient.fromItems(Items.EMERALD)),
 //    OBSIDIAN("obsidian_armor_material", 28, new int[] { 1, 3, 4, 3 }, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 1, 0f, () -> Ingredient.fromItems(Items.OBSIDIAN)),
 
-    QUARTZ("quartz_armor_material", 15, new int[] { 3, 5, 6, 3 }, 8, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 1, 0f, () -> Ingredient.fromItems(ActuallyItems.BLACK_QUARTS.get())),
+    QUARTZ("quartz_armor_material", 15, new int[] { 3, 5, 6, 3 }, 8, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 1, 0f, () -> Ingredient.fromItems(ActuallyItems.BLACK_QUARTZ.get())),
     RESTONIA("restonia_armor_material", 18, new int[] { 3, 6, 7, 3 }, 9, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0, 0f, () -> Ingredient.fromItems(ActuallyItems.RESTONIA_CRYSTAL.get())),
     PALIS("palis_armor_material", 10, new int[] { 3, 6, 7, 3 }, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0, 0f, () -> Ingredient.fromItems(ActuallyItems.PALIS_CRYSTAL.get())),
     DIAMATINE("diamatine_armor_material", 36, new int[] { 4, 7, 8, 4 }, 12, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 3, 0f, () -> Ingredient.fromItems(ActuallyItems.DIAMATINE_CRYSTAL.get())),

src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java

@@ -13,7 +13,7 @@ import java.util.function.Supplier;
  * todo: review to ensure all values act as intended
  */
 public enum ToolMaterials implements IItemTier {
-    QUARTZ(2, 280, 6.5f, 2.0f, 10, () -> Ingredient.fromItems(ActuallyItems.BLACK_QUARTS.get())),
+    QUARTZ(2, 280, 6.5f, 2.0f, 10, () -> Ingredient.fromItems(ActuallyItems.BLACK_QUARTZ.get())),
     RESTONIA(2, 300, 7.0f, 2.25f, 12, () -> Ingredient.fromItems(ActuallyItems.RESTONIA_CRYSTAL.get())),
     PALIS(2, 300, 7.0f, 2.25f, 12, () -> Ingredient.fromItems(ActuallyItems.PALIS_CRYSTAL.get())),
     DIAMATINE(3, 1600, 9.0f, 4.0f, 14, () -> Ingredient.fromItems(ActuallyItems.DIAMATINE_CRYSTAL.get())),

src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java

@@ -144,14 +144,14 @@ public class GeneratorLanguage extends LanguageProvider {
         addItem(ActuallyItems.GOLD_AIOT, "Gold AIOT");
         addItem(ActuallyItems.DIAMOND_AIOT, "Diamond AIOT");
         addItem(ActuallyItems.NETHERITE_AIOT, "Netherite AIOT");
-        addItem(ActuallyItems.QUARTZ_AIOT, "Quartz AIOT");
+        addItem(ActuallyItems.QUARTZ_AIOT, "Black Quartz AIOT");
         addItem(ActuallyItems.ENORI_AIOT, "Enori AIOT");
         addItem(ActuallyItems.EMERADIC_AIOT, "Emeradic AIOT");
         addItem(ActuallyItems.VOID_AIOT, "Void AIOT");
         addItem(ActuallyItems.DIAMATINE_AIOT, "Diamatine AIOT");
         addItem(ActuallyItems.PALIS_AIOT, "Palis AIOT");
         addItem(ActuallyItems.RESTONIA_AIOT, "Restonia AIOT");
-        addItem(ActuallyItems.BLACK_QUARTS, "Black Quarts");
+        addItem(ActuallyItems.BLACK_QUARTZ, "Black Quartz");
 
         // Crystals
         addItem(ActuallyItems.RESTONIA_CRYSTAL, "Restonia Crystal");

src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java

@@ -161,7 +161,7 @@ public class GeneratorLoot extends LootTableProvider {
             this.registerCrystal(ActuallyBlocks.CRYSTAL_CLUSTER_EMERADIC, ActuallyItems.GREEN_CRYSTAL_SHARD);
             this.registerCrystal(ActuallyBlocks.CRYSTAL_CLUSTER_ENORI, ActuallyItems.WHITE_CRYSTAL_SHARD);
 
-            this.registerLootTable(ActuallyBlocks.ORE_BLACK_QUARTZ.get(), ore -> droppingItemWithFortune(ore, ActuallyItems.BLACK_QUARTS.get()));
+            this.registerLootTable(ActuallyBlocks.ORE_BLACK_QUARTZ.get(), ore -> droppingItemWithFortune(ore, ActuallyItems.BLACK_QUARTZ.get()));
         }
 
         // This isn't quite right :cry: fortune doesn't change it

src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java

@@ -45,7 +45,7 @@ public class GeneratorRecipes extends RecipeProvider {
         battery(ActuallyItems.QUINTUPLE_BATTERY, ActuallyItems.QUADRUPLE_BATTERY, ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL).build(consumer);
 
         ShapedRecipeBuilder.shapedRecipe(ActuallyItems.BASIC_COIL.get())
-                .key('r', ActuallyItems.RESTONIA_CRYSTAL.get()).key('b', ActuallyItems.BLACK_QUARTS.get())
+                .key('r', ActuallyItems.RESTONIA_CRYSTAL.get()).key('b', ActuallyItems.BLACK_QUARTZ.get())
                 .patternLine(" r ").patternLine("rbr").patternLine(" r ")
                 .addCriterion("has_restonia", hasItem(ActuallyItems.RESTONIA_CRYSTAL.get())).build(consumer);
 
@@ -141,7 +141,7 @@ public class GeneratorRecipes extends RecipeProvider {
         gridOfToResult(ActuallyItems.RED_CRYSTAL_SHARD.get(), ActuallyItems.RESTONIA_CRYSTAL.get(), true, consumer);
 
         // Misc
-        gridOfToResult(ActuallyItems.BLACK_QUARTS.get(), ActuallyBlocks.BLACK_QUARTZ.get(), false, consumer);
+        gridOfToResult(ActuallyItems.BLACK_QUARTZ.get(), ActuallyBlocks.BLACK_QUARTZ.get(), false, consumer);
 
         lamp(ActuallyBlocks.LAMP_WHITE, Tags.Items.DYES_WHITE, consumer);
         lamp(ActuallyBlocks.LAMP_ORANGE, Tags.Items.DYES_ORANGE, consumer);
@@ -161,7 +161,7 @@ public class GeneratorRecipes extends RecipeProvider {
         lamp(ActuallyBlocks.LAMP_BLACK, Tags.Items.DYES_BLACK, consumer);
 
         // Hot stuff
-        CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(ActuallyBlocks.ORE_BLACK_QUARTZ.get()), ActuallyItems.BLACK_QUARTS.get(), 0.7F, 100).addCriterion("has_black_quartz_ore", hasItem(ActuallyBlocks.ORE_BLACK_QUARTZ.get())).build(consumer);
+        CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(ActuallyBlocks.ORE_BLACK_QUARTZ.get()), ActuallyItems.BLACK_QUARTZ.get(), 0.7F, 100).addCriterion("has_black_quartz_ore", hasItem(ActuallyBlocks.ORE_BLACK_QUARTZ.get())).build(consumer);
     }
 
     private void blockOfToItem(Supplier<Block> blockOf, Supplier<Item> result, int count, Consumer<IFinishedRecipe> consumer) {
@@ -184,7 +184,7 @@ public class GeneratorRecipes extends RecipeProvider {
     private void lamp(Supplier<Block> result, ITag<Item> color, Consumer<IFinishedRecipe> consumer) {
         ShapedRecipeBuilder.shapedRecipe(result.get())
                 .key('g', Blocks.GLOWSTONE).key('b', color)
-                .key('c', ActuallyItems.PALIS_CRYSTAL.get()).key('q', ActuallyItems.BLACK_QUARTS.get())
+                .key('c', ActuallyItems.PALIS_CRYSTAL.get()).key('q', ActuallyItems.BLACK_QUARTZ.get())
                 .patternLine("gcg")
                 .patternLine("bqb")
                 .patternLine("gcg")