added block for salpeter and sulfor

src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java

@@ -52,18 +52,35 @@ public class QuicklyBlocks {
 			properties -> new Monsterhoarder(properties));
 	public static final Block ITEMHOARDER = registerBlock("itemhoarder", properties -> new Itemhoarder(properties));
 	public static final Block DRILL = registerBlock("drill", properties -> new BlockDrill(properties));
-	public static final Block STACKER = registerBlock("blockstacker", properties -> new BlockStacker(properties.strength(2.5f)));
+	public static final Block STACKER = registerBlock("blockstacker",
-	public static final Block DIRTSALPETER = registerBlock("dirtsalpeter", properties -> new BlockOre(properties.strength(2.2f), null, new ItemStack(QuicklyItems.SALPETER, 1), new ItemStack(Items.DIRT)));
+			properties -> new BlockStacker(properties.strength(2.5f)));
-	public static final Block SANDSALPETER = registerBlock("sandsalpeter", properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 2), new ItemStack(Items.SAND)));
+	public static final Block DIRTSALPETER = registerBlock("dirtsalpeter",
-	public static final Block OREDEEPSLATESULFOR = registerBlock("oredeepslatesulfor", properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SULFOR, 4)));
+			properties -> new BlockOre(properties.strength(2.2f), null, new ItemStack(QuicklyItems.SALPETER, 1),
-	public static final Block ORENETHERSULFOR = registerBlock("orenethersulfor", properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SULFOR)));
+					new ItemStack(Items.DIRT)));
-	public static final Block ORESALPETER = registerBlock("oresalpeter", properties -> new BlockOre(properties.strength(1.9f), null, new ItemStack(QuicklyItems.SALPETER, 2)));
+	public static final Block SANDSALPETER = registerBlock("sandsalpeter",
-	public static final Block ORESANDSALPETER = registerBlock("oresandsalpeter", properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 7)));
+			properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 2),
-	public static final Block ORESULFOR = registerBlock("oresulfor", properties -> new BlockOre(properties.strength(1.9f), null, new ItemStack(QuicklyItems.SULFOR)));
+					new ItemStack(Items.SAND)));
-	public static final Block ORESPEEDPOWDER = registerBlock("orespeedpowder", properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SPEEDPOWDER)));
+	public static final Block OREDEEPSLATESULFOR = registerBlock("oredeepslatesulfor",
-	public static final Block OREDEEPSLATESPEEDPOWDER = registerBlock("oredeepslatespeedpowder", properties -> new BlockOre(properties.strength(2.1f), null, new ItemStack(QuicklyItems.SPEEDPOWDER, 2)));
+			properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SULFOR, 4)));
+	public static final Block ORENETHERSULFOR = registerBlock("orenethersulfor",
+			properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SULFOR)));
+	public static final Block ORESALPETER = registerBlock("oresalpeter",
+			properties -> new BlockOre(properties.strength(1.9f), null, new ItemStack(QuicklyItems.SALPETER, 2)));
+	public static final Block ORESANDSALPETER = registerBlock("oresandsalpeter",
+			properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 7)));
+	public static final Block ORESULFOR = registerBlock("oresulfor",
+			properties -> new BlockOre(properties.strength(1.9f), null, new ItemStack(QuicklyItems.SULFOR)));
+	public static final Block ORESPEEDPOWDER = registerBlock("orespeedpowder",
+			properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SPEEDPOWDER)));
+	public static final Block OREDEEPSLATESPEEDPOWDER = registerBlock("oredeepslatespeedpowder",
+			properties -> new BlockOre(properties.strength(2.1f), null, new ItemStack(QuicklyItems.SPEEDPOWDER, 2)));
+	public static final Block SALPETERBLOCK = registerBlock("blocksalpeter",
+			properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 9)));
+	public static final Block SULFORBLOCK = registerBlock("blocksulfor",
+			properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SULFOR, 9)));
 
-	// TODO: merge lavahoarder and emptylavahoarder into one block using a BooleanProperty for the lava fill state
+	// TODO: merge lavahoarder and emptylavahoarder into one block using a
+	// BooleanProperty for the lava fill state
 
 	private static final Block registerBlock(String name, Properties properties) {
 		return QuicklyBlocks.registerBlock(name, properties, p -> new Block(p));
@@ -105,6 +122,8 @@ public class QuicklyBlocks {
 			block.accept(ITEMHOARDER);
 			block.accept(DRILL);
 			block.accept(STACKER);
+			block.accept(SALPETERBLOCK);
+			block.accept(SULFORBLOCK);
 		});
 	}
 }

src/main/resources/assets/quickly/blockstates/blocksulfor.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "quickly:block/blocksulfor"
+		}
+	}
+}

src/main/resources/assets/quickly/items/blocksalpeter.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickly:block/blocksalpeter"
+  }
+}

src/main/resources/assets/quickly/items/blocksulfor.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickly:block/blocksulfor"
+	}
+}

src/main/resources/assets/quickly/lang/de_de.json

@@ -5,8 +5,10 @@
 	"item.quickly.blockcanolaplant": "Rapspflanze",
 	"item.quickly.blockcottonplant": "Baumwollpflanze",
 	"item.quickly.blockquickiepowder": "Eilpulverblock",
+	"item.quickly.blocksalpeter": "Salpeterblock",
 	"item.quickly.blockspeedpowder": "Fluchtpulverblock",
 	"item.quickly.blockstacker": "Stapler",
+	"item.quickly.blocksulfor": "Schwefelblock",
   "item.quickly.blockturquoise": "Türkisblock",
 	"item.quickly.canola": "Raps",
 	"item.quickly.canolabottle": "Rapsöl",

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

@@ -5,9 +5,11 @@
 	"item.quickly.blockcanolaplant": "canola plant",
 	"item.quickly.blockcottonplant": "cotton plant",
 	"item.quickly.blockquickiepowder": "quickie powder block",
+  "item.quickly.blocksalpeter": "block of salpeter",
 	"item.quickly.blockspeedpowder": "speed powder block",
 	"item.quickly.blockstacker": "stacker",
-  "item.quickly.blockturquoise": "block of turquoise",
+	"item.quickly.blocksulfor": "block of sulfor",
+	"item.quickly.blockturquoise": "block of turquoise",
 	"item.quickly.canola": "canola",
 	"item.quickly.canolabottle": "canola oil",
 	"item.quickly.canolabottlestack": "canola oil collection",

src/main/resources/assets/quickly/models/block/blocksalpeter.json

@@ -0,0 +1,6 @@
+{
+		"parent": "block/cube_all",
+		"textures": {
+				"all": "quickly:block/blocksalpeter"
+		}
+}

src/main/resources/assets/quickly/models/block/blocksulfor.json

@@ -0,0 +1,6 @@
+{
+		"parent": "block/cube_all",
+		"textures": {
+				"all": "quickly:block/blocksulfor"
+		}
+}

src/main/resources/assets/quickly/models/item/blocksalpeter.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/blocksalpeter",
+		"display": {
+				"thirdperson": {
+						"rotation": [ 10, -45, 170 ],
+						"translation": [ 0, 1.5, -2.75 ],
+						"scale": [ 0.375, 0.375, 0.375 ]
+				}
+		}
+}

src/main/resources/assets/quickly/models/item/blocksulfor.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/blocksulfor",
+		"display": {
+				"thirdperson": {
+						"rotation": [ 10, -45, 170 ],
+						"translation": [ 0, 1.5, -2.75 ],
+						"scale": [ 0.375, 0.375, 0.375 ]
+				}
+		}
+}

src/main/resources/data/quickly/recipe/shaped_blocksalpeter.json

@@ -0,0 +1,15 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"sss",
+		"sss",
+		"sss"
+	],
+	"key": {
+		"s": "quickly:salpeter"
+	},
+	"result": {
+		"id": "quickly:blocksalpeter",
+		"count": 1
+	}
+}

src/main/resources/data/quickly/recipe/shaped_blocksulfor.json

@@ -0,0 +1,15 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"sss",
+		"sss",
+		"sss"
+	],
+	"key": {
+		"s": "quickly:sulfor"
+	},
+	"result": {
+		"id": "quickly:blocksulfor",
+		"count": 1
+	}
+}

src/main/resources/data/quickly/recipe/shapeless_salpeter_from_block.json

@@ -0,0 +1,10 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+     "quickly:blocksalpeter"
+  ],
+  "result": {
+    "id": "quickly:salpeter",
+    "count": 9
+  }
+}

src/main/resources/data/quickly/recipe/shapeless_sulfor_from_block.json

@@ -0,0 +1,10 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    "quickly:blocksulfor"
+  ],
+  "result": {
+    "id": "quickly:sulfor",
+    "count": 9
+  }
+}