Sphalerite + zinc

TODO.txt

@@ -44,10 +44,10 @@ materials.rock	No		Slate
 materials.rock	No		Chalk
 -------------------------------------------------------------------------------------------------------
 materials.ore	No		Rock salt
-materials.ore	No		Zinc (sphalerite)
 materials.ore	No		Aluminium (bauxite)
 materials.ore	No		Silver (native, horn silver)
 materials.ore	No		Lead (galena)
+materials.ore	No		Cinnabar
 -------------------------------------------------------------------------------------------------------
 tech.base		No		Alloy furnace
 							-> fix item pickup in creative mode
@@ -65,5 +65,6 @@ world			???		Limestone hills / mountains
 ???				Yes		Improved pistons
 ???				???		Insulated redstone wires
 ???				???		Electrical-like power
-???			???		Atlases
-???			???		"Luggage" (chests with persistent contents)
+???				???		Atlases
+???				???		"Luggage" (chests with persistent contents)
+???				???		Blackboard

src/java/mmm/materials/Materials.java

@@ -5,6 +5,7 @@ import mmm.materials.ore.MOCassiterite;
 import mmm.materials.ore.MOCopper;
 import mmm.materials.ore.MOCuprite;
 import mmm.materials.ore.MOMalachite;
+import mmm.materials.ore.MOSphalerite;
 import mmm.materials.rock.MLimestone;
 import mmm.utils.I_URecipeRegistrar;
 import mmm.utils.URegistry;
@@ -25,21 +26,25 @@ public class Materials
 	public static final MMetal IRON;
 	public static final MMetal COPPER;
 	public static final MMetal TIN;
+	public static final MMetal ZINC;
+
 	public static final MMetal BRONZE;
 	public static final MMetal STEEL;
 	// public static final MMetal RED_COPPER;
 
 	public static final Item ITEM_SLAG;
+	public static final Item ITEM_COKE;
+	public static final Item ITEM_PIG_IRON_INGOT;
 	public static final Item ITEM_MALACHITE;
 	public static final Item ITEM_CUPRITE;
-	public static final Item ITEM_COKE;
 	public static final Item ITEM_CASSITERITE;
-	public static final Item ITEM_PIG_IRON_INGOT;
+	public static final Item ITEM_SPHALERITE;
 
 	public static final MOre ORE_COPPER;
 	public static final MOre ORE_MALACHITE;
 	public static final MOre ORE_CUPRITE;
 	public static final MOre ORE_CASSITERITE;
+	public static final MOre ORE_SPHALERITE;
 
 	static {
 		// Rocks
@@ -50,9 +55,12 @@ public class Materials
 		IRON = new MMetal( Blocks.IRON_BLOCK , Items.IRON_INGOT , //
 				new MMetalItem( E_MMetalItemType.NUGGET , "iron" ) );
 
-		// Custom metals
+		// Custom metals - pure
 		COPPER = new MMetal( "copper" , 0.4f , 4f , 1 , MapColor.DIRT );
 		TIN = new MMetal( "tin" , 0.6f , 1f , 0 , MapColor.GRAY );
+		ZINC = new MMetal( "zinc" , 0.4f , 4f , 1 , MapColor.GRAY );
+
+		// Custom metals - alloys
 		BRONZE = new MMetal( "bronze" , 0f , 5f , 1 , MapColor.BROWN );
 		STEEL = new MMetal( "steel" , 0f , 7f , 2 , MapColor.LIGHT_BLUE );
 		STEEL.BLOCK.setResistance( 12f );
@@ -60,18 +68,22 @@ public class Materials
 
 		// Items that do not correspond to metals or ores
 		ITEM_SLAG = Materials.makeItem( "slag" );
-		ITEM_MALACHITE = Materials.makeItem( "malachite" );
-		ITEM_CUPRITE = Materials.makeItem( "cuprite" );
 		ITEM_COKE = Materials.makeFuel( "coke" , 9600 );
-		ITEM_CASSITERITE = Materials.makeItem( "cassiterite" );
 		ITEM_PIG_IRON_INGOT = new MMetalItem( E_MMetalItemType.INGOT , "pig_iron" );
 		URegistry.addItem( Materials.ITEM_PIG_IRON_INGOT );
 
+		// Ore drops
+		ITEM_MALACHITE = Materials.makeItem( "malachite" );
+		ITEM_CUPRITE = Materials.makeItem( "cuprite" );
+		ITEM_CASSITERITE = Materials.makeItem( "cassiterite" );
+		ITEM_SPHALERITE = Materials.makeItem( "sphalerite" );
+
 		// Actual ores
 		ORE_COPPER = new MOCopper( );
 		ORE_MALACHITE = new MOMalachite( );
 		ORE_CUPRITE = new MOCuprite( );
 		ORE_CASSITERITE = new MOCassiterite( );
+		ORE_SPHALERITE = new MOSphalerite( );
 
 		// Other recipes
 		URegistry.addRecipeRegistrar( new Materials( ) );

src/java/mmm/materials/ore/MOSphalerite.java

@@ -0,0 +1,36 @@
+package mmm.materials.ore;
+
+
+import java.util.List;
+
+import mmm.materials.MOre;
+import mmm.materials.Materials;
+import mmm.utils.I_UOreGenerationRegistrar;
+import mmm.world.WLocation;
+import mmm.world.WOreGenerationCondition;
+import mmm.world.WOreGenerationParameters;
+
+
+
+public class MOSphalerite
+		extends MOre
+		implements I_UOreGenerationRegistrar
+{
+
+	public MOSphalerite( )
+	{
+		super( "sphalerite" , 1 );
+		this.setMetal( Materials.ZINC );
+		this.setDrops( Materials.ITEM_SPHALERITE );
+		this.setExperience( 1 , 3 );
+	}
+
+
+	@Override
+	public void addConditions( final List< WOreGenerationCondition > conditions )
+	{
+		conditions.add( new WOreGenerationCondition( WLocation.inOverworld( ) ,
+				new WOreGenerationParameters( this.getDefaultState( ) , 15 , 15 ) ) );
+	}
+
+}

src/resources/assets/mmm/blockstates/materials/block/zinc.json

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

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

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

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

@@ -20,14 +20,14 @@ item.mmm.materials.nugget.copper.name=Copper Nugget
 tile.mmm.materials.block.copper.name=Copper Block
 tile.mmm.materials.ore.copper.name=Native Copper
 item.mmm.materials.stone.malachite.name=Malachite
-tile.mmm.materials.ore.malachite.name=Malachite Ore
+tile.mmm.materials.ore.malachite.name=Malachite
 item.mmm.materials.stone.cuprite.name=Cuprite
-tile.mmm.materials.ore.cuprite.name=Cuprite Ore
+tile.mmm.materials.ore.cuprite.name=Cuprite
 
 item.mmm.materials.ingot.tin.name=Tin Ingot
 item.mmm.materials.nugget.tin.name=Tin Nugget
 tile.mmm.materials.block.tin.name=Tin Block
-tile.mmm.materials.ore.cassiterite.name=Cassiterite Ore
+tile.mmm.materials.ore.cassiterite.name=Cassiterite
 item.mmm.materials.stone.cassiterite.name=Cassiterite
 
 item.mmm.materials.ingot.bronze.name=Bronze Ingot
@@ -38,6 +38,12 @@ item.mmm.materials.ingot.steel.name=Steel Ingot
 item.mmm.materials.nugget.steel.name=Steel Nugget
 tile.mmm.materials.block.steel.name=Steel Block
 
+tile.mmm.materials.ore.sphalerite.name=Sphalerite
+item.mmm.materials.stone.sphalerite.name=Sphalerite
+item.mmm.materials.ingot.zinc.name=Zinc Ingot
+item.mmm.materials.nugget.zinc.name=Zinc Nugget
+tile.mmm.materials.block.zinc.name=Zinc Block
+
 
 tile.mmm.tech.base.alloy_furnace.inactive.name=Alloy Furnace
 container.mmm.alloy_furnace.contents=Furnace Contents

src/resources/assets/mmm/models/block/materials/block/zinc.json

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

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

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

src/resources/assets/mmm/models/item/materials/block/zinc.json

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

src/resources/assets/mmm/models/item/materials/ingot/zinc.json

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

src/resources/assets/mmm/models/item/materials/nugget/zinc.json

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

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

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

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

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