Recipes and lang stuff...

src/generated/resources/.cache/cache

@@ -580,6 +580,9 @@ d2666ce077d5892a3bffde70ddf53492ec876900 data/actuallyadditions/recipes/advanced
 a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json
 3d899eb727ee209cce77eae52985ea8ed1fc2455 data/actuallyadditions/recipes/basic_coil.json
 a4b4ff66a1d3387791b1bd72e461cdc62558a054 data/actuallyadditions/recipes/battery_box.json
+cd00d32378f5ed0db08103936c9e2cc47b1771b7 data/actuallyadditions/recipes/black_quartz_brick_slab.json
+9c0512a4bb87a8b845f5ed613462a327128dc2f3 data/actuallyadditions/recipes/black_quartz_brick_stair.json
+2ea8d3c0f42d30f7b9959c308231f48210cd579a data/actuallyadditions/recipes/black_quartz_brick_wall.json
 5ba46742bff7dbc31c3ef64a4b3ab021df4e1c79 data/actuallyadditions/recipes/black_quartz_pillar_slab.json
 141bfc11e38b358e2c53f59e816509a25b61bccd data/actuallyadditions/recipes/black_quartz_pillar_stair.json
 c6cb7541b7390b0af525b3b6854a943e461b1a03 data/actuallyadditions/recipes/black_quartz_pillar_wall.json
@@ -838,6 +841,9 @@ ccdc4ab92dc7c0aae4de1566435ef5d701e14934 data/actuallyadditions/recipes/miningle
 469f920b7b32f5d29c435cb73cec09776c882c3d data/actuallyadditions/recipes/ring_of_magnetizing.json
 d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json
 655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json
+3e3c5cac5685f5637443d5bfc0c023f98217ebb3 data/actuallyadditions/recipes/smooth_black_quartz_slab.json
+1da023c272bae872b88901e5fca5535d78a4772b data/actuallyadditions/recipes/smooth_black_quartz_stair.json
+8b5b5288e7b80fd1c414379855e2d5e4e7eb4d5e data/actuallyadditions/recipes/smooth_black_quartz_wall.json
 000ef9362f2202191f74132c3079ec4c1e2bfec8 data/actuallyadditions/recipes/solid_fuel/charcoal.json
 64211ff8cd4ae617f3be4bc6d7e9ff1f73c46e7d data/actuallyadditions/recipes/solid_fuel/coal-block.json
 340732fadc7be543ba9ae17f6f1c974022d31de3 data/actuallyadditions/recipes/solid_fuel/coal.json

src/generated/resources/data/actuallyadditions/recipes/black_quartz_brick_slab.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "QQQ"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:black_quartz_brick_block"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:black_quartz_brick_slab"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/black_quartz_brick_stair.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "Q  ",
+    "QQ ",
+    "QQQ"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:black_quartz_brick_block"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:black_quartz_brick_stair"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/black_quartz_brick_wall.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "QQQ",
+    "QQQ"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:black_quartz_brick_block"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:black_quartz_brick_wall"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/smooth_black_quartz_slab.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "QQQ"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:smooth_black_quartz_block"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:smooth_black_quartz_slab"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/smooth_black_quartz_stair.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "Q  ",
+    "QQ ",
+    "QQQ"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:smooth_black_quartz_block"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:smooth_black_quartz_stair"
+  }
+}

src/generated/resources/data/actuallyadditions/recipes/smooth_black_quartz_wall.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "QQQ",
+    "QQQ"
+  ],
+  "key": {
+    "Q": {
+      "item": "actuallyadditions:smooth_black_quartz_block"
+    }
+  },
+  "result": {
+    "item": "actuallyadditions:smooth_black_quartz_wall"
+  }
+}

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

@@ -10,6 +10,7 @@ import net.minecraft.tags.ItemTags;
 import net.minecraft.util.IItemProvider;
 import net.minecraftforge.common.Tags;
 
+import javax.annotation.Nonnull;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.function.Consumer;
@@ -20,7 +21,7 @@ public class BlockRecipeGenerator extends RecipeProvider {
     }
 
     @Override
-    protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer) {
+    protected void buildShapelessRecipes(@Nonnull Consumer<IFinishedRecipe> consumer) {
         //Battery Box
         Recipe.shapeless(ActuallyBlocks.BATTERY_BOX.getItem()).ingredients(ActuallyBlocks.ENERGIZER.get(), ActuallyBlocks.ENERVATOR.get(), ActuallyItems.BASIC_COIL.get()).save(consumer);
 
@@ -92,6 +93,24 @@ public class BlockRecipeGenerator extends RecipeProvider {
         //Black Quartz Stairs
         Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer);
 
+        //Smooth Black Quartz Wall
+        Recipe.wall(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), consumer);
+
+        //Smooth Black Quartz Slab
+        Recipe.slab(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), consumer);
+
+        //Smooth Black Quartz Stairs
+        Recipe.stairs(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), consumer);
+
+        //Black Quartz Brick Wall
+        Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_BRICK_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), consumer);
+
+        //Black Quartz Brick Slab
+        Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_BRICK_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), consumer);
+
+        //Black Quartz Brick Stairs
+        Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_BRICK_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_BRICK.get(), consumer);
+
         //Pillar Black Quartz Wall
         Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_PILLAR_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), consumer);
 

src/main/resources/assets/actuallyadditions/lang/en_us.json

@@ -96,9 +96,11 @@
   "death.actuallyadditions.atomicreconstructor.5": "%s should have used some re-construction foam.",
   "_comment": "Blocks",
   "block.actuallyadditions.ore_black_quartz": "Black Quartz Ore (wip)",
-  "block.actuallyadditions.black_quartz": "Block of Black Quartz",
+  "block.actuallyadditions.black_quartz_block": "Block of Black Quartz",
-  "block.actuallyadditions.black_quartz_chiseled": "Chiseled Block of Black Quartz",
+  "block.actuallyadditions.black_quartz_chiseled_block": "Chiseled Block of Black Quartz",
-  "block.actuallyadditions.black_quartz_pillar": "Pillar of Black Quartz",
+  "block.actuallyadditions.black_quartz_pillar_block": "Pillar of Black Quartz",
+  "block.actuallyadditions.smooth_black_quartz_block": "Smooth Black Quartz",
+  "block.actuallyadditions.black_quartz_brick_block": "Black Quartz Bricks",
   "block.actuallyadditions.feeder": "Automatic Feeder (wip)",
   "block.actuallyadditions.crusher": "Crusher (wip)",
   "block.actuallyadditions.crusher_double": "Double Crusher (wip)",
@@ -142,12 +144,12 @@
   "block.actuallyadditions.fluid_collector": "Fluid Collector",
   "block.actuallyadditions.phantom_booster": "Phantom Booster (wip)",
   "block.actuallyadditions.coffee": "Coffee Plant",
-  "block.actuallyadditions.testifi_bucks_green_wall": "Ethetic Green Block",
+  "block.actuallyadditions.ethetic_green_wall": "Ethetic Green Quartz Block",
-  "block.actuallyadditions.testifi_bucks_white_wall": "Ethetic Quartz",
+  "block.actuallyadditions.ethetic_white_wall": "Ethetic Quartz",
-  "block.actuallyadditions.testifi_bucks_green_stairs": "Ethetic Green Stairs",
+  "block.actuallyadditions.ethetic_green_stairs": "Ethetic Green Quartz Stairs",
-  "block.actuallyadditions.testifi_bucks_white_stairs": "Ethetic Quartz Stairs",
+  "block.actuallyadditions.ethetic_white_stairs": "Ethetic Quartz Stairs",
-  "block.actuallyadditions.testifi_bucks_green_slab": "Ethetic Green Slab",
+  "block.actuallyadditions.ethetic_green_slab": "Ethetic Green Quartz Slab",
-  "block.actuallyadditions.testifi_bucks_white_slab": "Ethetic Quartz Slab",
+  "block.actuallyadditions.ethetic_white_slab": "Ethetic Quartz Slab",
   "block.actuallyadditions.canola": "Canola Plant",
   "block.actuallyadditions.treasure_chest": "Treasure Chest (wip)",
   "block.actuallyadditions.canola_press": "Canola Press",
@@ -173,8 +175,8 @@
   "block.actuallyadditions.laser_relay_fluids": "Fluid Laser Relay (wip)",
   "block.actuallyadditions.iron_casing": "Iron Casing",
   "block.actuallyadditions.black_lotus": "Black Lotus",
-  "block.actuallyadditions.testifi_bucks_white_fence": "Ethetic Quartz Wall",
+  "block.actuallyadditions.ethetic_white_fence": "Ethetic Quartz Wall",
-  "block.actuallyadditions.testifi_bucks_green_fence": "Ethetic Green Wall",
+  "block.actuallyadditions.ethetic_green_fence": "Ethetic Green Wall",
   "block.actuallyadditions.restonia_crystal_block": "Restonia Crystal Block",
   "block.actuallyadditions.palis_crystal_block": "Palis Crystal Block",
   "block.actuallyadditions.diamatine_crystal_block": "Diamatine Crystal Block",
@@ -195,6 +197,12 @@
   "block.actuallyadditions.chiseled_quartz_wall": "Chiseled Black Quartz Wall",
   "block.actuallyadditions.chiseled_quartz_stair": "Chiseled Black Quartz Stairs",
   "block.actuallyadditions.chiseled_quartz_slab": "Chiseled Black Quartz Slab",
+  "block.actuallyadditions.smooth_black_quartz_wall": "Smooth Black Quartz Wall",
+  "block.actuallyadditions.smooth_black_quartz_stair": "Smooth Black Quartz Stairs",
+  "block.actuallyadditions.smooth_black_quartz_slab": "Smooth Black Quartz Slab",
+  "block.actuallyadditions.black_quartz_brick_wall": "Black Quartz Brick Wall",
+  "block.actuallyadditions.black_quartz_brick_stair": "Black Quartz Brick Stairs",
+  "block.actuallyadditions.black_quartz_brick_slab": "Black Quartz Brick Slab",
   "block.actuallyadditions.pillar_quartz_wall": "Black Quartz Pillar Wall",
   "block.actuallyadditions.pillar_quartz_stair": "Black Quartz Pillar Stairs",
   "block.actuallyadditions.pillar_quartz_slab": "Black Quartz Pillar Slab",