Galena

TODO.txt

@@ -41,13 +41,18 @@ materials		No		Alloys
 materials		No		Metal from slag
 							-> in metal recycler
 materials		No		Black sand
+materials		No		Metals
+							Lead
+							Aluminium
+							Silver
+materials		No		Liquids
+							Mercury
 -------------------------------------------------------------------------------------------------------
 materials.rock	No		Smooth limestone
 materials.rock	No		Smooth slate
 materials.rock	No		Basalt
 -------------------------------------------------------------------------------------------------------
 materials.ore	No		Silver (native, horn silver)
-materials.ore	No		Lead (galena)
 materials.ore	No		Cinnabar
 materials.ore	No		Olivine
 -------------------------------------------------------------------------------------------------------

src/java/mmm/materials/Materials.java

@@ -5,6 +5,7 @@ import mmm.materials.ore.MOBauxite;
 import mmm.materials.ore.MOCassiterite;
 import mmm.materials.ore.MOCopper;
 import mmm.materials.ore.MOCuprite;
+import mmm.materials.ore.MOGalena;
 import mmm.materials.ore.MOMalachite;
 import mmm.materials.ore.MORockSalt;
 import mmm.materials.ore.MOSphalerite;
@@ -54,6 +55,7 @@ public class Materials
 	public static final MOre ORE_SPHALERITE;
 	public static final MOre ORE_ROCK_SALT;
 	public static final MOre ORE_BAUXITE;
+	public static final MOre ORE_GALENA;
 
 	static {
 		// Rocks
@@ -74,7 +76,7 @@ public class Materials
 		// 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 );
+		Materials.STEEL.BLOCK.setResistance( 12f );
 		// RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED );
 
 		// Items that do not correspond to metals or ores
@@ -98,6 +100,7 @@ public class Materials
 		ORE_SPHALERITE = new MOSphalerite( );
 		ORE_ROCK_SALT = new MORockSalt( );
 		ORE_BAUXITE = new MOBauxite( );
+		ORE_GALENA = new MOGalena( );
 
 		// Other recipes
 		URegistry.addRecipeRegistrar( new Materials( ) );

src/java/mmm/materials/ore/MOGalena.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 MOGalena
+		extends MOre
+		implements I_UOreGenerationRegistrar
+{
+
+	public MOGalena( )
+	{
+		super( "galena" , 1 );
+	}
+
+
+	@Override
+	public void addConditions( final List< WGOreCondition > conditions )
+	{
+		conditions.add( new WGOreCondition( WLocation.inOverworld( ) ,
+				new WGOreParameters( this.getDefaultState( ) , 10 , 9 ) ) );
+	}
+
+}

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

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

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

@@ -17,6 +17,8 @@ item.mmm.materials.stone.rock_salt.name=Salt Crystals
 
 tile.mmm.materials.ore.bauxite.name=Bauxite
 
+tile.mmm.materials.ore.galena.name=Galena
+
 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/galena.json

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

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

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