From 06d2bfee726573edefa16600e5c390b8ed37a654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Mon, 18 Jul 2016 16:02:47 +0200 Subject: [PATCH] Brass --- TODO.txt | 3 +-- src/java/mmm/materials/MAlloys.java | 11 ++++++++++- .../mmm/blockstates/materials/block/brass.json | 5 +++++ src/resources/assets/mmm/lang/en_US.lang | 4 ++++ .../mmm/models/block/materials/block/brass.json | 6 ++++++ .../mmm/models/item/materials/block/brass.json | 3 +++ .../mmm/models/item/materials/ingot/brass.json | 6 ++++++ .../mmm/models/item/materials/nugget/brass.json | 6 ++++++ .../mmm/textures/blocks/materials/block/brass.png | Bin 0 -> 234 bytes .../mmm/textures/items/materials/ingots/brass.png | Bin 0 -> 203 bytes .../textures/items/materials/nuggets/brass.png | Bin 0 -> 137 bytes 11 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/resources/assets/mmm/blockstates/materials/block/brass.json create mode 100644 src/resources/assets/mmm/models/block/materials/block/brass.json create mode 100644 src/resources/assets/mmm/models/item/materials/block/brass.json create mode 100644 src/resources/assets/mmm/models/item/materials/ingot/brass.json create mode 100644 src/resources/assets/mmm/models/item/materials/nugget/brass.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/block/brass.png create mode 100644 src/resources/assets/mmm/textures/items/materials/ingots/brass.png create mode 100644 src/resources/assets/mmm/textures/items/materials/nuggets/brass.png 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 0000000000000000000000000000000000000000..f3afb1a541307ca0d2c7070305db675d6b6b33b5 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|8$DedLp07O-`MB$`heQz#kX@B zRahKvoOrTw?>m8&d$V~Y8m@HSJ(vEin%R@%P)fXw6xTx~69wfRZQjR|CzvkIZa5ul zE!pkOeBm#P$pTMDQwNm?iweY*vl~uKTJZ4D#Dq6e4Jt9rn-q4j?f96nPbHXHU}1*C zG>6Zen=AwrO%5~*O=shf?q;)a`er4@n{g>4v2_vS47tuL3?-}~%oD7(92N37Bxo>E iu~?B~McUh#N`}SP4tG3G(O3s`JcFmJpUXO@geCw!m{&{y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cf695ff3f224f709d8fd3d4e9cd1ef34c9a32ea3 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`lRRA`f9kB`WO?@+6eQs0)nFri$1;{OC@ zhglA70+(2VntK9y7&O}?oBV}2&d*=Oeyo6b!ryI$GdbgYPe|k)m^O7;LeE)-6kdb+ z!v+ri literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..47df757ea807db84cbdcaf73394e3f28708d2281 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`0iG_7Ar_~T6C_wI9P8Q+)k~;( ze||by^8fz2U7!D-+alXDn+J|BIo`QQIdnc7)_66R^=4HeFdrrhkyVel}H l+!lP4VTNK#wwxma!;~9Ak52O>{Rf)O;OXk;vd$@?2>=q&GKv5I literal 0 HcmV?d00001