Saltpeter

Also recipe for gunpowder using charcoal, sulphur and saltpeter.

TODO.txt

@@ -56,9 +56,7 @@ materials.rock	No		Smooth limestone
 materials.rock	No		Smooth slate
 materials.rock	No		Smooth basalt
 -------------------------------------------------------------------------------------------------------
-materials.ore	No		Silver (native, horn silver)
 materials.ore	No		Olivine
-materials.ore	No		Saltpeter
 -------------------------------------------------------------------------------------------------------
 tech.base		No		Alloy furnace
 							-> fix item pickup in creative mode                                         BF
@@ -76,6 +74,7 @@ animals			???		Goats
 -------------------------------------------------------------------------------------------------------
 world			???		Improved system to handle neighbouring biomes                                   BF
 world.gen		???		Make basalt gen behave correctly at chunk boundaries							BF
+world.gen		???		Improve saltpeter gen so it generates in caves only								BF
 world			???		Volcanos
 -------------------------------------------------------------------------------------------------------
 ???				???		Sub-blocks
@@ -84,4 +83,3 @@ world			???		Volcanos
 ???				???		Electrical-like power
 ???				???		Atlases
 ???				???		"Luggage" (chests with persistent contents)
-???				???		Blackboard

src/java/mmm/materials/Materials.java

@@ -53,6 +53,7 @@ public class Materials
 	public static final Item ITEM_SPHALERITE;
 	public static final Item ITEM_ROCK_SALT;
 	public static final Item ITEM_SULPHUR_POWDER;
+	public static final Item ITEM_SALTPETER;
 
 	public static final MOre ORE_COPPER;
 	public static final MOre ORE_MALACHITE;
@@ -65,6 +66,7 @@ public class Materials
 	public static final MOre ORE_CINNABAR;
 	public static final MOre ORE_SULPHUR;
 	public static final MOre ORE_SILVER;
+	public static final MOre ORE_SALTPETER;
 
 	static {
 		// Rocks
@@ -102,6 +104,7 @@ public class Materials
 		ITEM_SPHALERITE = Materials.makeItem( "sphalerite" );
 		ITEM_ROCK_SALT = Materials.makeItem( "rock_salt" );
 		ITEM_SULPHUR_POWDER = Materials.makeItem( "sulphur_powder" );
+		ITEM_SALTPETER = Materials.makeItem( "saltpeter_powder" );
 
 		// Actual ores
 		ORE_COPPER = new MOre( "copper" , 1 ) //
@@ -134,6 +137,9 @@ public class Materials
 				.setDrops( Materials.ITEM_SULPHUR_POWDER , 3 , 6 ) //
 				.setExperience( 1 , 2 );
 		ORE_SILVER = new MOre( "silver" , 2 );
+		ORE_SALTPETER = new MOre( "saltpeter" , 0 ) //
+				.setDrops( Materials.ITEM_SALTPETER , 4 , 8 ) //
+				.setExperience( 0 , 1 );
 
 		// Other recipes, ore generation parameters, etc.
 		final Materials materials = new Materials( );
@@ -194,6 +200,12 @@ public class Materials
 		GameRegistry.addShapelessRecipe( new ItemStack( Items.DYE , 1 , 2 ) ,
 				new ItemStack( Materials.ITEM_MALACHITE ) );
 
+		// Gunpowder from saltpeter, sulphur and charcoal
+		GameRegistry.addShapelessRecipe( new ItemStack( Items.GUNPOWDER ) , //
+				new ItemStack( ITEM_SALTPETER ) , //
+				new ItemStack( ITEM_SULPHUR_POWDER ) , //
+				new ItemStack( Items.COAL , 1 , 1 ) );
+
 		// Bronze
 		MAlloyRecipe.build( ).setName( "materials/bronze" ).setBurnTime( 400 ) //
 				.addInput( Materials.COPPER.INGOT ) //
@@ -283,6 +295,9 @@ public class Materials
 
 		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
 				new WGOreParameters( Materials.ORE_SILVER , 3 , 9 , 0 , 40 ) ) );
+
+		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
+				new WGOreParameters( Materials.ORE_SALTPETER , 10 , 9 , 0 , 80 ) ) );
 	}
 
 }

src/java/mmm/world/gen/WGBasalt.java

@@ -57,9 +57,6 @@ public class WGBasalt
 					if ( rockNearLava[ offset++ ] && random.nextInt( 5 ) != 4 ) {
 						mbp.setY( y );
 						world.setBlockState( mbp , WGBasalt.BS_BASALT );
-						if ( y >= 40 ) {
-							System.err.println( "BASALT at " + mbp );
-						}
 					}
 				}
 			}

src/resources/assets/mmm/blockstates/materials/ore/saltpeter.json

@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "mmm:materials/ore/saltpeter" }
+    }
+}

src/resources/assets/mmm/lang/en_US.lang

@@ -27,6 +27,9 @@ item.mmm.materials.stone.sulphur_powder.name=Sulphur Powder
 
 tile.mmm.materials.ore.silver.name=Native Silver
 
+tile.mmm.materials.ore.saltpeter.name=Saltpeter
+item.mmm.materials.stone.saltpeter_powder.name=Saltpeter Powder
+
 item.mmm.materials.stone.coke.name=Coke
 item.mmm.materials.stone.slag.name=Slag
 item.mmm.materials.nugget.iron.name=Iron Nugget

src/resources/assets/mmm/models/block/materials/ore/saltpeter.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+        "all": "mmm:blocks/materials/ore/saltpeter"
+    }
+}

src/resources/assets/mmm/models/item/materials/ore/saltpeter.json

@@ -0,0 +1,3 @@
+{
+    "parent": "mmm:block/materials/ore/saltpeter"
+}

src/resources/assets/mmm/models/item/materials/stone/saltpeter_powder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/materials/stone/saltpeter_powder"
+    }
+}