Sulphur

TODO.txt

@@ -58,7 +58,6 @@ materials.rock	No		Smooth basalt
 -------------------------------------------------------------------------------------------------------
 materials.ore	No		Silver (native, horn silver)
 materials.ore	No		Olivine
-materials.ore	No		Sulfur
 materials.ore	No		Saltpeter
 -------------------------------------------------------------------------------------------------------
 tech.base		No		Alloy furnace

src/java/mmm/materials/MOre.java

@@ -113,7 +113,7 @@ public class MOre
 	}
 
 
-	public MOre setMetal( final MMetal metal , int count )
+	public MOre setMetal( final MMetal metal , final int count )
 	{
 		return this.setMetal( metal , count , E_MMetalItemType.INGOT );
 	}
@@ -129,6 +129,22 @@ public class MOre
 	}
 
 
+	@Override
+	public MOre setResistance( final float resistance )
+	{
+		super.setResistance( resistance );
+		return this;
+	}
+
+
+	@Override
+	public MOre setHardness( final float hardness )
+	{
+		super.setHardness( hardness );
+		return this;
+	}
+
+
 	@Override
 	@Nullable
 	public Item getItemDropped( final IBlockState state , final Random rand , final int fortune )

src/java/mmm/materials/Materials.java

@@ -14,6 +14,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockStone;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.state.pattern.BlockMatcher;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -51,6 +52,7 @@ public class Materials
 	public static final Item ITEM_CASSITERITE;
 	public static final Item ITEM_SPHALERITE;
 	public static final Item ITEM_ROCK_SALT;
+	public static final Item ITEM_SULPHUR_POWDER;
 
 	public static final MOre ORE_COPPER;
 	public static final MOre ORE_MALACHITE;
@@ -61,6 +63,7 @@ public class Materials
 	public static final MOre ORE_BAUXITE;
 	public static final MOre ORE_GALENA;
 	public static final MOre ORE_CINNABAR;
+	public static final MOre ORE_SULPHUR;
 
 	static {
 		// Rocks
@@ -97,6 +100,7 @@ public class Materials
 		ITEM_CASSITERITE = Materials.makeItem( "cassiterite" );
 		ITEM_SPHALERITE = Materials.makeItem( "sphalerite" );
 		ITEM_ROCK_SALT = Materials.makeItem( "rock_salt" );
+		ITEM_SULPHUR_POWDER = Materials.makeItem( "sulphur_powder" );
 
 		// Actual ores
 		ORE_COPPER = new MOre( "copper" , 1 ) //
@@ -123,10 +127,16 @@ public class Materials
 		ORE_BAUXITE = new MOre( "bauxite" , 1 );
 		ORE_GALENA = new MOre( "galena" , 1 );
 		ORE_CINNABAR = new MOre( "cinnabar" , 1 );
+		ORE_SULPHUR = new MOre( "sulphur" , 0 ) //
+				.setResistance( 2.0f ) //
+				.setHardness( 1.0f ) //
+				.setDrops( ITEM_SULPHUR_POWDER , 3 , 6 ) //
+				.setExperience( 1 , 2 );
 
 		// Other recipes, ore generation parameters, etc.
 		final Materials materials = new Materials( );
 		URegistry.addRecipeRegistrar( materials );
+		URegistry.addOreGenerationRegistrar( materials );
 	}
 
 
@@ -264,6 +274,10 @@ public class Materials
 
 		conditions.add( new WGOreCondition( WLocation.inOverworld( ) , //
 				new WGOreParameters( Materials.ORE_CINNABAR , 1 , 20 , 0 , 50 ) ) );
+
+		conditions.add( new WGOreCondition( WLocation.inTheNether( ) , //
+				new WGOreParameters( Materials.ORE_SULPHUR , 15 , 25 , //
+						BlockMatcher.forBlock( Blocks.NETHERRACK ) ) ) );
 	}
 
 }

src/java/mmm/world/WLocation.java

@@ -8,6 +8,7 @@ import net.minecraft.world.biome.Biome;
 public class WLocation
 {
 	private static I_WLocationCheck inOverworld;
+	private static I_WLocationCheck inTheNether;
 
 
 	public static I_WLocationCheck inDimension( final int dimension )
@@ -25,6 +26,15 @@ public class WLocation
 	}
 
 
+	public static I_WLocationCheck inTheNether( )
+	{
+		if ( WLocation.inTheNether == null ) {
+			WLocation.inTheNether = WLocation.inDimension( -1 );
+		}
+		return WLocation.inTheNether;
+	}
+
+
 	public static < T extends Biome > WLocationInBiome< T > inBiome( final Class< T > biomeType )
 	{
 		return new WLocationInBiome<>( biomeType );

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

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

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

@@ -22,6 +22,9 @@ tile.mmm.materials.ore.galena.name=Galena
 
 tile.mmm.materials.ore.cinnabar.name=Cinnabar
 
+tile.mmm.materials.ore.sulphur.name=Sulphur
+item.mmm.materials.stone.sulphur_powder.name=Sulphur 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/sulphur.json

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

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

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

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

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