added missing ores

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

@@ -22,9 +22,9 @@ import net.minecraft.world.phys.BlockHitResult;
 public class BlockOre extends Block {
 
 	private SoundEvent soundEvent;
-	private ItemStack dropItems;
+	private ItemStack[] dropItems;
 
-	public BlockOre(Properties properties, SoundEvent soundEvent, ItemStack dropItems) {
+	public BlockOre(Properties properties, SoundEvent soundEvent, ItemStack... dropItems) {
 		super(properties.requiresCorrectToolForDrops());
 		this.soundEvent = soundEvent;
 		this.dropItems = dropItems;
@@ -32,8 +32,8 @@ public class BlockOre extends Block {
 
 	@Override
 	protected List<ItemStack> getDrops(BlockState state, Builder builder) {
-		ItemStack droppable = dropItems == null ? new ItemStack(this.asItem()) : dropItems;
+		ItemStack[] droppable = dropItems == null ? new ItemStack[] { new ItemStack(this.asItem()) } : dropItems;
-		return Arrays.asList(new ItemStack[] { droppable });
+		return Arrays.asList(droppable);
 	}
 
 	@Override

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

@@ -3,10 +3,6 @@ package de.jottyfan.minecraft.block;
 import java.util.function.Function;
 
 import de.jottyfan.minecraft.Quickly;
-import de.jottyfan.minecraft.blockentity.QuicklyBlockEntity;
-import de.jottyfan.minecraft.blockentity.BlockStackerEntity;
-import de.jottyfan.minecraft.blockentity.DrillBlockEntity;
-import de.jottyfan.minecraft.blockentity.ItemHoarderBlockEntity;
 import de.jottyfan.minecraft.item.QuicklyItems;
 import de.jottyfan.minecraft.tab.QuicklyTab;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
@@ -19,10 +15,10 @@ import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
 
 /**
@@ -57,10 +53,17 @@ public class QuicklyBlocks {
 	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 DIRTSALPETER = registerBlock("dirtsalpeter", properties -> new BlockOre(properties.strength(2.2f), null, new ItemStack(QuicklyItems.SALPETER, 1), new ItemStack(Items.DIRT)));
+	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 OREDEEPSLATESULFOR = registerBlock("oredeepslatesulfor", 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)));
 
-	// TODO: add salpeter ore, sulfor ore
 	// TODO: merge lavahoarder and emptylavahoarder into one block using a BooleanProperty for the lava fill state
-	// TODO: repair block stacker bugs; transport seems to only use the max container size slot
 
 	private static final Block registerBlock(String name, Properties properties) {
 		return QuicklyBlocks.registerBlock(name, properties, p -> new Block(p));
@@ -84,8 +87,17 @@ public class QuicklyBlocks {
 		ItemGroupEvents.modifyEntriesEvent(QuicklyTab.QUICKLY_TAB).register(block -> {
 			block.accept(KELPBUNDLE);
 			block.accept(TURQUOISEBLOCK);
+			block.accept(DIRTSALPETER);
+			block.accept(SANDSALPETER);
+			block.accept(ORESALPETER);
+			block.accept(ORESULFOR);
 			block.accept(ORETURQUOISE);
+			block.accept(ORESPEEDPOWDER);
+			block.accept(ORESANDSALPETER);
 			block.accept(OREDEEPSLATETURQUOISE);
+			block.accept(OREDEEPSLATESULFOR);
+			block.accept(OREDEEPSLATESPEEDPOWDER);
+			block.accept(ORENETHERSULFOR);
 			block.accept(EMPTYLAVAHOARDER);
 			block.accept(SPEEDPOWDER);
 			block.accept(QUICKIEPOWDER);

src/main/java/de/jottyfan/minecraft/feature/QuicklyFeatures.java

@@ -17,7 +17,24 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature;
  */
 public class QuicklyFeatures {
 	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_ORETURQUOISE = genCf("oreturquoise");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_ORESULFOR = genCf("oresulfor");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_OREDEEPSLATESULFUR = genCf("oredepslatesulfor");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_ORESALPETER = genCf("oresalpeter");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_ORENETHERSULFOR = genCf("orenethersulfor");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_DIRTSALPETER = genCf("dirtsalpeter");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_SANDSALPETER = genCf("sandsalpeter");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_ORESANDSALPETER = genCf("oresandsalpeter");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> CF_ORESPEEDPOWDER = genCf("orespeedpowder");
+
 	public static final ResourceKey<PlacedFeature> PF_ORETURQUOISE = genPf("oreturquoise");
+	public static final ResourceKey<PlacedFeature> PF_ORESULFOR = genPf("oresulfor");
+	public static final ResourceKey<PlacedFeature> PF_OREDEEPSLATESULFOR = genPf("oredeepslatesulfor");
+	public static final ResourceKey<PlacedFeature> PF_ORESALPETER = genPf("oresalpeter");
+	public static final ResourceKey<PlacedFeature> PF_ORENETHERSULFOR = genPf("orenethersulfor");
+	public static final ResourceKey<PlacedFeature> PF_DIRTSALPETER = genPf("dirtsalpeter");
+	public static final ResourceKey<PlacedFeature> PF_SANDSALPETER = genPf("sandsalpeter");
+	public static final ResourceKey<PlacedFeature> PF_ORESANDSALPETER = genPf("oresandsalpeter");
+	public static final ResourceKey<PlacedFeature> PF_ORESPEEDPOWDER = genPf("orespeedpowder");
 
 	private static final ResourceKey<ConfiguredFeature<?, ?>> genCf(String name) {
 		return ResourceKey.create(Registries.CONFIGURED_FEATURE, Identifier.fromNamespaceAndPath(Quickly.MOD_ID, name));
@@ -29,5 +46,14 @@ public class QuicklyFeatures {
 
 	public static final void registerFeatures() {
 		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORETURQUOISE);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESULFOR);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESALPETER);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_DIRTSALPETER);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_SANDSALPETER);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESANDSALPETER);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_OREDEEPSLATESULFOR);
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESPEEDPOWDER);
+
+		BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORENETHERSULFOR);
 	}
 }

src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java

@@ -44,8 +44,9 @@ public class QuicklyItems {
 	public static final Item SPEEDINGOT = registerItem("speedingot");
 	public static final Item QUICKIEINGOT = registerItem("quickieingot");
 	public static final Item MAGNIFIER = registerItem("magnifier");
+	public static final Item SALPETER = registerItem("salpeter");
+	public static final Item SULFOR = registerItem("sulfor");
 
-	// TODO: salpeter, sulfor
 	// TODO: carrot stack
 	// TODO: tools
 
@@ -99,6 +100,8 @@ public class QuicklyItems {
 			item.accept(COPPERSTRING);
 			item.accept(COPPERSTICK);
 			item.accept(COPPERSTUB);
+			item.accept(SALPETER);
+			item.accept(SULFOR);
 			item.accept(MAGNIFIER);
 			item.accept(ARMOR_TURQUOISE_HELMET);
 			item.accept(ARMOR_TURQUOISE_CHESTPLATE);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -18,6 +18,7 @@
   "item.quickly.copperstub": "Kupferstummel",
 	"item.quickly.cotton": "Baumwolle",
 	"item.quickly.cottonseed": "Baumwollsaat",
+	"item.quickly.dirtsalpeter": "Salpetererde",
 	"item.quickly.drill": "Bohrer",
 	"item.quickly.emptylavahoarder": "Lavasauger",
 	"item.quickly.itemhoarder": "Itemsauger",
@@ -25,16 +26,26 @@
 	"item.quickly.lavahoarder": "voller Lavasauger",
 	"item.quickly.magnifier": "Lupe",
 	"item.quickly.monsterhoarder": "Monstersauger",
+	"item.quickly.oredeepslatespeedpowder": "Eilpulvertiefengesteinerz",
+	"item.quickly.oredeepslatesulfor": "Schwefeltiefengestein",
   "item.quickly.oredeepslateturquoise": "Türkistiefenerz",
+	"item.quickly.orenethersulfor": "Nether-Schwefel",
+	"item.quickly.oresalpeter": "Salpetererz",
+	"item.quickly.oresandsalpeter": "Salpetergestein",
+	"item.quickly.orespeedpowder": "Eilpulvererz",
+	"item.quickly.oresulfor": "Schwefelgestein",
   "item.quickly.oreturquoise": "Türkiserz",
   "item.quickly.oxidizedcopperpowder": "oxidiertes Kupferpulver",
   "item.quickly.quickieingot": "Eilpulverbarren",
 	"item.quickly.quickiepowder": "Eilpulver",
   "item.quickly.rawturquoise": "rohes Türkis",
 	"item.quickly.rotten_flesh_stripes": "geschnittenes Gammelfleisch",
+	"item.quickly.salpeter": "Salpeter",
+	"item.quickly.sandsalpeter": "Salpetersand",
   "item.quickly.speedingot": "Fluchtpulverbarren",
 	"item.quickly.speedpowder": "Fluchtpulver",
   "item.quickly.stub": "Stummel",
+	"item.quickly.sulfor": "Schwefel",
   "item.quickly.turquoise_boots": "Türkisschuhe",
   "item.quickly.turquoise_chestplate": "Türkisbrustpanzer",
   "item.quickly.turquoise_helmet": "Türkishelm",

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

@@ -18,6 +18,7 @@
   "item.quickly.copperstub": "copper stub",
 	"item.quickly.cotton": "cotton",
 	"item.quickly.cottonseed": "cotton seed",
+	"item.quickly.dirtsalpeter": "salpeter dirt",
 	"item.quickly.drill": "drill",
 	"item.quickly.emptylavahoarder": "lava hoarder",
 	"item.quickly.itemhoarder": "item hoarder",
@@ -25,16 +26,26 @@
 	"item.quickly.lavahoarder": "filled lava hoarder",
 	"item.quickly.magnifier": "magnifier",
 	"item.quickly.monsterhoarder": "monster hoarder",
+	"item.quickly.oredeepslatespeedpowder": "speed poweder deepslate ore",
+	"item.quickly.oredeepslatesulfor": "sulfor deepslate stone",
   "item.quickly.oredeepslateturquoise": "turquoise deepslate ore",
+	"item.quickly.orenethersulfor": "nether sulfor",
+	"item.quickly.oresalpeter": "salpeter ore",
+	"item.quickly.oresandsalpeter": "salpeter sandstone",
+	"item.quickly.orespeedpowder": "speed powder ore",
+	"item.quickly.oresulfor": "sulfor stone",
   "item.quickly.oreturquoise": "turquoise ore",
   "item.quickly.oxidizedcopperpowder": "oxidized copper powder",
   "item.quickly.quickieingot": "quickie powder ingot",
 	"item.quickly.quickiepowder": "quickie powder",
   "item.quickly.rawturquoise": "raw turquoise",
 	"item.quickly.rotten_flesh_stripes": "rotton flesh stripes",
+	"item.quickly.salpeter": "salpeter",
+	"item.quickly.sandsalpeter": "salpeter sand",
   "item.quickly.speedingot": "speed powder ingot",
 	"item.quickly.speedpowder": "speed powder",
   "item.quickly.stub": "stub",
+	"item.quickly.sulfor": "sulfor",
   "item.quickly.turquoise_boots": "turquoise boots",
   "item.quickly.turquoise_chestplate": "turquoise chestplate",
   "item.quickly.turquoise_helmet": "turquoise helmet",

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+{
+		"parent": "block/cube_column",
+		"textures": {
+				"end" : "minecraft:block/sandstone_top",
+				"side": "quickly:block/oresandsalpeter"
+		}
+}

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

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/dirtsalpeter",
+		"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/oredeepslatespeedpowder.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/oredeepslatespeedpowder",
+		"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/oredeepslatesulfor.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/oredeepslatesulfor",
+		"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/orenethersulfor.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/orenethersulfor",
+		"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/oresalpeter.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/oresalpeter",
+		"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/oresandsalpeter.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/oresandsalpeter",
+		"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/orespeedpowder.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/orespeedpowder",
+		"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/oresulfor.json

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/oresulfor",
+		"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/salpeter.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/coal",
+    "textures": {
+        "layer0": "quickly:item/salpeter"
+    }
+}

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

@@ -0,0 +1,10 @@
+{
+		"parent": "quickly:block/sandsalpeter",
+		"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/sulfor.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/coal",
+    "textures": {
+        "layer0": "quickly:item/sulfor"
+    }
+}

src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -2,6 +2,15 @@
 		"replace": false,
 		"values": [
 			"quickly:oreturquoise",
-			"quickly:oredeepslateturquoise"
+			"quickly:oredeepslateturquoise",
+			"quickly:oresulfor",
+			"quickly:oredeepslatesulfor",
+			"quickly:orenethersulfor",
+			"quickly:oresalpeter",
+			"quickly:oresandsalpeter",
+			"quickly:sandsalpeter",
+			"quickly:dirtsalpeter",
+			"quickly:orespeedpowder",
+			"quickly:oredeepslatespeedpowder"
 		]
 	}

src/main/resources/data/quickly/tag/items/ores/oresalpeter.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "quickly:oresalpeter"
+  ]
+}

src/main/resources/data/quickly/tag/items/ores/orespeedpowder.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "quickly:orespeedpowder"
+  ]
+}

src/main/resources/data/quickly/tag/items/ores/oresulfor.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "quickly:oresulfor"
+  ]
+}

src/main/resources/data/quickly/tags/block/mineable/pickaxe.json

@@ -2,6 +2,15 @@
 		"replace": false,
 		"values": [
 			"quickly:oreturquoise",
-			"quickly:oredeepslateturquoise"
+			"quickly:oredeepslateturquoise",
+			"quickly:oresulfor",
+			"quickly:oredeepslatesulfor",
+			"quickly:orenethersulfor",
+			"quickly:oresalpeter",
+			"quickly:oresandsalpeter",
+			"quickly:sandsalpeter",
+			"quickly:dirtsalpeter",
+			"quickly:orespeedpowder",
+			"quickly:oredeepslatespeedpowder"
 		]
 	}

src/main/resources/data/quickly/worldgen/configured_feature/dirtsalpeter.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 4,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:dirtsalpeter"
+        },
+        "target": {
+          "predicate_type": "minecraft:block_match",
+          "block": "minecraft:dirt"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/oredeepslatesulfor.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 20,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:oredeepslatesulfor"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:deepslate_ore_replaceables"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/orenethersulfor.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 20,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:orenethersulfor"
+        },
+        "target": {
+          "predicate_type": "minecraft:block_match",
+          "block": "minecraft:netherrack"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/oresalpeter.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 12,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:oresalpeter"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:stone_ore_replaceables"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/oresandsalpeter.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 6,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:oresandsalpeter"
+        },
+        "target": {
+          "predicate_type": "minecraft:block_match",
+          "block": "minecraft:sandstone"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/orespeedpowder.json

@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 7,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:orespeedpowder"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:stone_ore_replaceables"
+        }
+      },
+      {
+        "state": {
+          "Name": "quickly:oredeepslatespeedpowder"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:deepslate_ore_replaceables"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/oresulfor.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 10,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:oresulfor"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:stone_ore_replaceables"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/configured_feature/sandsalpeter.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 8,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickly:sandsalpeter"
+        },
+        "target": {
+          "predicate_type": "minecraft:block_match",
+          "block": "minecraft:sand"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickly/worldgen/placed_feature/dirtsalpeter.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:dirtsalpeter",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 5
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 125
+        },
+        "min_inclusive": {
+          "absolute": 16
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/oredeepslatesulfor.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:oredeepslatesulfor",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 9
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 0
+        },
+        "min_inclusive": {
+          "absolute": -125
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/orenethersulfor.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:orenethersulfor",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 12
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 125
+        },
+        "min_inclusive": {
+          "absolute": 5
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/oresalpeter.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:oresalpeter",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 10
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 125
+        },
+        "min_inclusive": {
+          "absolute": 0
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/oresandsalpeter.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:oresandsalpeter",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 15
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 125
+        },
+        "min_inclusive": {
+          "absolute": 32
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/orespeedpowder.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:orespeedpowder",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 8
+    },
+    {
+    	"type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 60
+        },
+        "min_inclusive": {
+          "absolute": -120
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/oresulfor.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:oresulfor",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 9
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 64
+        },
+        "min_inclusive": {
+          "absolute": 0
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

src/main/resources/data/quickly/worldgen/placed_feature/sandsalpeter.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickly:sandsalpeter",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 10
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 125
+        },
+        "min_inclusive": {
+          "absolute": 32
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}