Cinnabar

TODO.txt

@@ -41,6 +41,7 @@ materials		No		Alloys
 materials		No		Metal from slag
 							-> in metal recycler
 materials		No		Black sand
+materials		No		Quicksand / quagmire
 materials		No		Metals
 							Lead
 							Aluminium
@@ -53,8 +54,9 @@ materials.rock	No		Smooth slate
 materials.rock	No		Basalt
 -------------------------------------------------------------------------------------------------------
 materials.ore	No		Silver (native, horn silver)
-materials.ore	No		Cinnabar
 materials.ore	No		Olivine
+materials.ore	No		Sulfur
+materials.ore	No		Saltpeter
 -------------------------------------------------------------------------------------------------------
 tech.base		No		Alloy furnace
 							-> fix item pickup in creative mode                                         BF

src/java/mmm/materials/Materials.java

@@ -3,6 +3,7 @@ package mmm.materials;
 
 import mmm.materials.ore.MOBauxite;
 import mmm.materials.ore.MOCassiterite;
+import mmm.materials.ore.MOCinnabar;
 import mmm.materials.ore.MOCopper;
 import mmm.materials.ore.MOCuprite;
 import mmm.materials.ore.MOGalena;
@@ -56,6 +57,7 @@ public class Materials
 	public static final MOre ORE_ROCK_SALT;
 	public static final MOre ORE_BAUXITE;
 	public static final MOre ORE_GALENA;
+	public static final MOre ORE_CINNABAR;
 
 	static {
 		// Rocks
@@ -101,6 +103,7 @@ public class Materials
 		ORE_ROCK_SALT = new MORockSalt( );
 		ORE_BAUXITE = new MOBauxite( );
 		ORE_GALENA = new MOGalena( );
+		ORE_CINNABAR = new MOCinnabar( );
 
 		// Other recipes
 		URegistry.addRecipeRegistrar( new Materials( ) );

src/java/mmm/materials/ore/MOCinnabar.java

@@ -0,0 +1,32 @@
+package mmm.materials.ore;
+
+
+import java.util.List;
+
+import mmm.materials.MOre;
+import mmm.utils.I_UOreGenerationRegistrar;
+import mmm.world.WLocation;
+import mmm.world.gen.WGOreCondition;
+import mmm.world.gen.WGOreParameters;
+
+
+
+public class MOCinnabar
+		extends MOre
+		implements I_UOreGenerationRegistrar
+{
+
+	public MOCinnabar( )
+	{
+		super( "cinnabar" , 1 );
+	}
+
+
+	@Override
+	public void addConditions( final List< WGOreCondition > conditions )
+	{
+		conditions.add( new WGOreCondition( WLocation.inOverworld( ) ,
+				new WGOreParameters( this.getDefaultState( ) , 1 , 20 , 0 , 50 ) ) );
+	}
+
+}

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

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

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

@@ -19,6 +19,8 @@ tile.mmm.materials.ore.bauxite.name=Bauxite
 
 tile.mmm.materials.ore.galena.name=Galena
 
+tile.mmm.materials.ore.cinnabar.name=Cinnabar
+
 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/cinnabar.json

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

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

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