diff --git a/TODO.txt b/TODO.txt
index 36d5533..3546a48 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -31,8 +31,7 @@ food No Extra recipes
Various mashes
-------------------------------------------------------------------------------------------------------
materials No Alloys
- Brass
- Alnico or some variant thereof (iron + aluminium + redstone?)
+ Alnico or some variant thereof (iron/steel + aluminium + redstone?)
materials No Metal from slag
-> in metal recycler
materials No Black sand
diff --git a/src/java/mmm/materials/MAlloys.java b/src/java/mmm/materials/MAlloys.java
index 1f62f95..c0be2a6 100644
--- a/src/java/mmm/materials/MAlloys.java
+++ b/src/java/mmm/materials/MAlloys.java
@@ -14,6 +14,7 @@ public class MAlloys
implements I_RecipeRegistrar
{
public final MMetal BRONZE;
+ public final MMetal BRASS;
public final MMetal STEEL;
// public static final MMetal RED_COPPER;
@@ -23,6 +24,7 @@ public class MAlloys
CRegistry.addRecipeRegistrar( this );
this.BRONZE = new MMetal( "bronze" , 0f , 5f , 1 , MapColor.BROWN );
+ this.BRASS = new MMetal( "brass" , 0f , 4f , 1 , MapColor.GOLD );
this.STEEL = new MMetal( "steel" , 0f , 7f , 2 , MapColor.LIGHT_BLUE ) //
.setBlockResistance( 12f );
// RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED );
@@ -33,12 +35,19 @@ public class MAlloys
public void registerRecipes( )
{
// Bronze
- MAlloyRecipe.build( ).setName( "materials/bronze" ).setBurnTime( 400 ) //
+ MAlloyRecipe.build( ).setName( "materials/bronze" ).setBurnTime( 200 ) //
.addInput( MmmMaterials.METAL.COPPER.INGOT ) //
.addInput( MmmMaterials.METAL.TIN.NUGGET ) //
.setOutput( this.BRONZE.INGOT ).setSlag( 1 ) //
.register( );
+ // Brass
+ MAlloyRecipe.build( ).setName( "materials/brass" ).setBurnTime( 200 ) //
+ .addInput( MmmMaterials.METAL.COPPER.INGOT , 2 ) //
+ .addInput( MmmMaterials.METAL.ZINC.INGOT ) //
+ .setOutput( this.BRASS.INGOT , 2 ).setSlag( 1 ) //
+ .register( );
+
// Pig iron
MAlloyRecipe.build( ).setName( "materials/pig_iron/from_ingot" ).setBurnTime( 1600 ) //
.addInput( MmmMaterials.METAL.IRON.INGOT ) //
diff --git a/src/resources/assets/mmm/blockstates/materials/block/brass.json b/src/resources/assets/mmm/blockstates/materials/block/brass.json
new file mode 100644
index 0000000..6d15451
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/materials/block/brass.json
@@ -0,0 +1,5 @@
+{
+ "variants": {
+ "normal": { "model": "mmm:materials/block/brass" }
+ }
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 59d4ec9..babaa13 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -54,6 +54,10 @@ item.mmm.materials.ingot.bronze.name=Bronze Ingot
item.mmm.materials.nugget.bronze.name=Bronze Nugget
tile.mmm.materials.block.bronze.name=Bronze Block
+item.mmm.materials.ingot.brass.name=Brass Ingot
+item.mmm.materials.nugget.brass.name=Brass Nugget
+tile.mmm.materials.block.brass.name=Brass Block
+
item.mmm.materials.ingot.steel.name=Steel Ingot
item.mmm.materials.nugget.steel.name=Steel Nugget
tile.mmm.materials.block.steel.name=Steel Block
diff --git a/src/resources/assets/mmm/models/block/materials/block/brass.json b/src/resources/assets/mmm/models/block/materials/block/brass.json
new file mode 100644
index 0000000..8ef6ec8
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/materials/block/brass.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:block/cube_all",
+ "textures": {
+ "all": "mmm:blocks/materials/block/brass"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/block/brass.json b/src/resources/assets/mmm/models/item/materials/block/brass.json
new file mode 100644
index 0000000..068fe97
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/block/brass.json
@@ -0,0 +1,3 @@
+{
+ "parent": "mmm:block/materials/block/brass"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/ingot/brass.json b/src/resources/assets/mmm/models/item/materials/ingot/brass.json
new file mode 100644
index 0000000..4be16b9
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/ingot/brass.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/materials/ingots/brass"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/nugget/brass.json b/src/resources/assets/mmm/models/item/materials/nugget/brass.json
new file mode 100644
index 0000000..159aff5
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/nugget/brass.json
@@ -0,0 +1,6 @@
+{
+ "parent": "minecraft:item/generated",
+ "textures": {
+ "layer0": "mmm:items/materials/nuggets/brass"
+ }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/materials/block/brass.png b/src/resources/assets/mmm/textures/blocks/materials/block/brass.png
new file mode 100644
index 0000000..f3afb1a
Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/materials/block/brass.png differ
diff --git a/src/resources/assets/mmm/textures/items/materials/ingots/brass.png b/src/resources/assets/mmm/textures/items/materials/ingots/brass.png
new file mode 100644
index 0000000..cf695ff
Binary files /dev/null and b/src/resources/assets/mmm/textures/items/materials/ingots/brass.png differ
diff --git a/src/resources/assets/mmm/textures/items/materials/nuggets/brass.png b/src/resources/assets/mmm/textures/items/materials/nuggets/brass.png
new file mode 100644
index 0000000..47df757
Binary files /dev/null and b/src/resources/assets/mmm/textures/items/materials/nuggets/brass.png differ