From 7de05978f0b9673548c6b691ad1df8191dfeaf3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Wed, 29 Jun 2016 20:37:19 +0200 Subject: [PATCH] Bronze alloy --- TODO.txt | 4 +++- src/java/mmm/materials/Materials.java | 10 +++++++++- .../mmm/blockstates/materials/block/bronze.json | 5 +++++ src/resources/assets/mmm/lang/en_US.lang | 4 ++++ .../mmm/models/block/materials/block/bronze.json | 6 ++++++ .../mmm/models/item/materials/block/bronze.json | 3 +++ .../mmm/models/item/materials/ingot/bronze.json | 6 ++++++ .../mmm/models/item/materials/nugget/bronze.json | 6 ++++++ .../textures/blocks/materials/block/bronze.png | Bin 0 -> 385 bytes .../textures/items/materials/ingots/bronze.png | Bin 0 -> 242 bytes .../textures/items/materials/nuggets/bronze.png | Bin 0 -> 176 bytes 11 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/resources/assets/mmm/blockstates/materials/block/bronze.json create mode 100644 src/resources/assets/mmm/models/block/materials/block/bronze.json create mode 100644 src/resources/assets/mmm/models/item/materials/block/bronze.json create mode 100644 src/resources/assets/mmm/models/item/materials/ingot/bronze.json create mode 100644 src/resources/assets/mmm/models/item/materials/nugget/bronze.json create mode 100644 src/resources/assets/mmm/textures/blocks/materials/block/bronze.png create mode 100644 src/resources/assets/mmm/textures/items/materials/ingots/bronze.png create mode 100644 src/resources/assets/mmm/textures/items/materials/nuggets/bronze.png diff --git a/TODO.txt b/TODO.txt index 7ce1afb..ccc5295 100644 --- a/TODO.txt +++ b/TODO.txt @@ -36,7 +36,6 @@ food No Extra recipes materials No Alloys Pig iron Steel - Bronze Brass Alnico materials No Metal from slag @@ -53,6 +52,9 @@ materials.ore No Lead (galena) ------------------------------------------------------------------------------------------------------- tech.base No Coke oven ------------------------------------------------------------------------------------------------------- +tech.tools No Bronze tools +tech.tools No Bronze armor +------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- world ??? Limestone hills / mountains diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java index 780cf66..a81fde8 100644 --- a/src/java/mmm/materials/Materials.java +++ b/src/java/mmm/materials/Materials.java @@ -25,6 +25,7 @@ public class Materials public static final MMetal IRON; public static final MMetal COPPER; public static final MMetal TIN; + public static final MMetal BRONZE; // public static final MMetal RED_COPPER; public static final Item ITEM_SLAG; @@ -50,6 +51,7 @@ public class Materials // Custom metals COPPER = new MMetal( "copper" , 0.4f , 4f , 1 , MapColor.DIRT ); TIN = new MMetal( "tin" , 0.6f , 1f , 0 , MapColor.GRAY ); + BRONZE = new MMetal( "bronze" , 0f , 5f , 0 , MapColor.BROWN ); // RED_COPPER = new MMetal( "red_copper" , 0f , 2f , 1 , MapColor.RED ); // Items that do not correspond to metals or ores @@ -103,10 +105,16 @@ public class Materials @Override public void registerRecipes( ) { - // Alloy recipes + MAlloyRecipe.build( ).setName( "materials/bronze" ).setBurnTime( 400 ) // + .addInput( Materials.COPPER.INGOT ) // + .addInput( Materials.TIN.NUGGET ) // + .setOutput( Materials.BRONZE.INGOT ).setSlag( 1 ) // + .register( ); + // MAlloyRecipe.build( ).setName( "materials/red_copper" ).setBurnTime( 800 ) // .addInput( Materials.COPPER.INGOT , 1 ).addInput( Items.REDSTONE , 2 ) // .setOutput( Materials.RED_COPPER.INGOT ).setSlag( 1 ).register( ); + // XXX coke is not an alloy MAlloyRecipe.build( ).setName( "materials/coke" ).setBurnTime( 3200 ).addInput( Items.COAL , 2 ) .setOutput( Materials.ITEM_COKE ).setSlag( 1 ).register( ); diff --git a/src/resources/assets/mmm/blockstates/materials/block/bronze.json b/src/resources/assets/mmm/blockstates/materials/block/bronze.json new file mode 100644 index 0000000..00c89d4 --- /dev/null +++ b/src/resources/assets/mmm/blockstates/materials/block/bronze.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "mmm:materials/block/bronze" } + } +} diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 7e2b284..7184657 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -29,6 +29,10 @@ tile.mmm.materials.block.tin.name=Tin Block tile.mmm.materials.ore.cassiterite.name=Cassiterite Ore item.mmm.materials.stone.cassiterite.name=Cassiterite +item.mmm.materials.ingot.bronze.name=Bronze Ingot +item.mmm.materials.nugget.bronze.name=Bronze Nugget +tile.mmm.materials.block.bronze.name=Bronze Block + tile.mmm.tech.base.alloy_furnace.inactive.name=Alloy Furnace container.mmm.alloy_furnace.contents=Furnace Contents diff --git a/src/resources/assets/mmm/models/block/materials/block/bronze.json b/src/resources/assets/mmm/models/block/materials/block/bronze.json new file mode 100644 index 0000000..b637839 --- /dev/null +++ b/src/resources/assets/mmm/models/block/materials/block/bronze.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "mmm:blocks/materials/block/bronze" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/block/bronze.json b/src/resources/assets/mmm/models/item/materials/block/bronze.json new file mode 100644 index 0000000..4eef2cb --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/block/bronze.json @@ -0,0 +1,3 @@ +{ + "parent": "mmm:block/materials/block/bronze" +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/ingot/bronze.json b/src/resources/assets/mmm/models/item/materials/ingot/bronze.json new file mode 100644 index 0000000..079a572 --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/ingot/bronze.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/ingots/bronze" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/materials/nugget/bronze.json b/src/resources/assets/mmm/models/item/materials/nugget/bronze.json new file mode 100644 index 0000000..db7f1ff --- /dev/null +++ b/src/resources/assets/mmm/models/item/materials/nugget/bronze.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/materials/nuggets/bronze" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/materials/block/bronze.png b/src/resources/assets/mmm/textures/blocks/materials/block/bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..f610c26b24cf8573dbeee59b27709794b5ebd729 GIT binary patch literal 385 zcmV-{0e=38P)9D#()!J-h6>MQShV#h2+Oo6R|MW~$v?8q_=1>8hnu z|GY}W^gQa+$m`Zv72xciR_W&K2i(`j?jbE+Y{q9`QxZ1lD<#=7e?H3P_QD_yFaLF^ z@PX?So#F?JqWk(UrjJ&J&^IacObSMvPP4)ltR@bVy?o~tXM79t6rg{lEU*XA&0Xn} zJoy5TS83rpa%AT}UhNFUDfABhHw9I8JgzfT3nBsB~`8i{XE z)7O>#0h_FlsKzVCPX<7tiJmTwAr_~T6C{idoSE?7o@4S-&X(xaR}Ritp!i~z-}^29 z_NVm;$|Rez%vLMuwcuqmJXJj9;j9mtJfEgH9E{4c`G1hD!K9H#aS7)VHp#^j3_(1` zEc4X_`nV=BCGTK7QRm$|@#tz!$-}%J{gauKbJ!HJ8-7Z+1tu}3ahzbtF-y!iB=-LV ko4``e*@`OJQUweQl2U(TH*9+119TjNr>mdKI;Vst05n8SD*ylh literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/materials/nuggets/bronze.png b/src/resources/assets/mmm/textures/items/materials/nuggets/bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..1886d6018359c299aa71da18129936075aba781a GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#0h_FlsO0YZpFjrqd%8G=Se#BykYKfFY@T|dUP8^gIDGE0|Cg=T{$D>c`AdBC z+~@Wu*$$X&4`2OX|7@7jS%DJfM~9Z2EM|?|rYy~H$!FTz5JQGEj+?XGfv(`Uu-o$P ShtzGL(F~rhelF{r5}E)LC^$#} literal 0 HcmV?d00001