From d979339ee9284be2698182f8de19b720d8d02f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Wed, 29 Jun 2016 21:13:44 +0200 Subject: [PATCH] Bronze armor --- TODO.txt | 2 +- src/java/mmm/tech/tools/TechTools.java | 6 +++++- src/resources/assets/mmm/lang/en_US.lang | 4 ++++ .../item/tech/tools/bronze/armor/chest.json | 6 ++++++ .../item/tech/tools/bronze/armor/feet.json | 6 ++++++ .../item/tech/tools/bronze/armor/head.json | 6 ++++++ .../item/tech/tools/bronze/armor/legs.json | 6 ++++++ .../items/tech/tools/bronze/armor/chest.png | Bin 0 -> 236 bytes .../items/tech/tools/bronze/armor/feet.png | Bin 0 -> 214 bytes .../items/tech/tools/bronze/armor/head.png | Bin 0 -> 202 bytes .../items/tech/tools/bronze/armor/legs.png | Bin 0 -> 197 bytes .../mmm/textures/models/armor/bronze_layer_1.png | Bin 0 -> 1093 bytes .../mmm/textures/models/armor/bronze_layer_2.png | Bin 0 -> 659 bytes 13 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/chest.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/feet.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/head.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/legs.png create mode 100644 src/resources/assets/mmm/textures/models/armor/bronze_layer_1.png create mode 100644 src/resources/assets/mmm/textures/models/armor/bronze_layer_2.png diff --git a/TODO.txt b/TODO.txt index d57e992..a64ee32 100644 --- a/TODO.txt +++ b/TODO.txt @@ -52,7 +52,7 @@ materials.ore No Lead (galena) ------------------------------------------------------------------------------------------------------- tech.base No Coke oven ------------------------------------------------------------------------------------------------------- -tech.tools No Bronze armor +tech.tools ------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index 4dada0e..3121120 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -11,14 +11,18 @@ public class TechTools public static final TTToolSet COPPER_TOOLS; public static final TTArmorSet COPPER_ARMOR; public static final TTToolSet BRONZE_TOOLS; + public static final TTArmorSet BRONZE_ARMOR; static { COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 16 , 7 , -3 ); COPPER_ARMOR = new TTArmorSet( "copper" , Materials.COPPER.INGOT , 10 , new int[] { 1 , 3 , 4 , 1 - } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); + } , 15 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); BRONZE_TOOLS = new TTToolSet( "bronze" , Materials.BRONZE.INGOT , 2 , 212 , 5.5f , 1.75f , 20 , 7.5f , -3.1f ); + BRONZE_ARMOR = new TTArmorSet( "bronze" , Materials.BRONZE.INGOT , 13 , new int[] { + 1 , 4 , 5 , 2 + } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 077903e..70ae32b 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -64,6 +64,10 @@ item.mmm.tech.tools.bronze.axe.name=Bronze Axe item.mmm.tech.tools.bronze.pickaxe.name=Bronze Pickaxe item.mmm.tech.tools.bronze.hoe.name=Bronze Hoe item.mmm.tech.tools.bronze.sword.name=Bronze Sword +item.mmm.tech.tools.bronze.armor.feet.name=Bronze Boots +item.mmm.tech.tools.bronze.armor.legs.name=Bronze Leggings +item.mmm.tech.tools.bronze.armor.chest.name=Bronze Chestplate +item.mmm.tech.tools.bronze.armor.head.name=Bronze Helmet item.milk.name=Cow milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json new file mode 100644 index 0000000..52647a7 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/chest" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json new file mode 100644 index 0000000..1374942 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/feet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/feet" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json new file mode 100644 index 0000000..aa04984 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/head.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/head" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json new file mode 100644 index 0000000..4f1d7a8 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/bronze/armor/legs.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/bronze/armor/legs" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/chest.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/chest.png new file mode 100644 index 0000000000000000000000000000000000000000..f5726570096bdb1ef98f2ee89cda679a26c58364 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNo2)Q{z?YI^y+EN#PZ!4!i_^&o5+x3ijj!!Fgthw? zCgknE_y3bjs>o4;LIJjot*sINlQY^h8zdXnbWE^mV@kQb;bfvIg9^tao4uE%dNxXO zT<%F^*ra{p5)YGt;|%Q+Mhx*0558ENg-^(}w#z?YBAm-$*K?i0sZHQYPY#Ef&*U@g Z3_ffB3-c|Pz7BK*gQu&X%Q~loCIB!3OdbFL literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/feet.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/feet.png new file mode 100644 index 0000000000000000000000000000000000000000..e7e9e2f3a193e38d57bffff9cc50dc3bde61b6c2 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNo2)P+liano7NAhFr;B5V#p&b(i8_bK#@F^dkA)Af ztjybg@Bb&6r~eN*t@+Q{nQZ#ti(mE{wglnjz1(c)7-railw>$8v9WOt!xG8aj0%P+ zrW$&Ung^CivNgTe~DWM4f D9@0b) literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/head.png b/src/resources/assets/mmm/textures/items/tech/tools/bronze/armor/head.png new file mode 100644 index 0000000000000000000000000000000000000000..00ea418b35b676431caa413bf13855fdf1d70e82 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNo2)Q{obZ{~T|l95PZ!4!i_^&o67w7)8(-U-`D}T% z^KX^J4jcEM`!@)@u3uy_|6V5Vu@`ItCM-7@a%Od!F|zml-+{@%WCL+lY)YIc>#ITHWiA2juBZf#ty^n#+8L13KB0@sP lvlw*VUF1EW<|oR)(D3Nc4}FhkM}Vd?c)I$ztaD0e0s#B4JB0uM literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/models/armor/bronze_layer_1.png b/src/resources/assets/mmm/textures/models/armor/bronze_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..dfd82c73ae8e31af43a58319ec91c13b6017babb GIT binary patch literal 1093 zcmV-L1iJf)P)%c8qfo@_0bgK*_uYu0}V`{Vn=s!a}8 z%kiL7zCT!v%9tAke7ks1UIyVWlL9Vw+YtqGqX15PTy&!F!`@0c?5~ttkMGaE0`{LT zR)UX0dm9Aj^xy4w=EDad?1$sEX#1dmMxVL4ae~_YC^Znl+<8#W%qyTs;V!n&$L@O@ z({bh~Is_0Q9(J6U_I+JClu8P zh)3a%R%64->FqfsPn4_k!e2HR6%_n}&XGRC_LHe_Kl+X&cvNHvrJ$n`VUA7V(AZ#v zeh`k+N9Y`;2m;J2^mH>gCz>2NLTD<0Ih5wyI4NS15O(VdKuDe3_WJcF0uq4qzYxW9 z`U>7lD5c3KCdo`1VFGpd7+OR@B2i~M?TDJW;1M}8FdrjF>;LbL{D7-Gpb3y=FLIEJ zI+$p5l8L}HA^*ow6OA~STC!1`7q-i_3EZEsj5CcytPUp0=|fl|wOzk`;sO#e0nPH( zeFW$@-D+2PfO*276zRr!j#I>r%@3|V@3ZC=@)fSE(-*{Wn%>PmcyG>LZ(ISeJ*lpa zl5tLR*&M`2$7O|yjk{i?^)mWw=rot0Kj{9-J$TObezTX2Ybn{W3F`#(i)@2blie@^ zORr&sj5($J`B6&5=zj{ylvLYf>}P)VGd000McNliru;07HN0~pbQ9ee-)0w765 zK~!ko?Uz|j0znXlIgf0^^5*r7yCSm5GVB@6P5S?9 zYciQ2L4pJc5+q2FAVGoz2@)ho>ScIWkV&H`^HwBJok&tg!1%r>U!TXa9#sS~Qb)kN z9m)H&s>(Wb1Zes@;L~PN$cBRl{BW6*?p0n!^@1$AC9VHiGg9zzt)OKvaG&_}u74C? z`U8C;@dN;7*(=G*psZlAS(`n$&CANIA01%Ukb(cgDR$xs00e+uhZO}!g>0v06-#MKRMFzh+@ZorT}F_rZ6QSr*WFqPs<*( zi|u@yjxg3t7s`wNVvU!3@c!U;>>hjRG4=-Ff?SNKaw+ThfN7m?FUsZYonYte>1^)? zY*U*kWDVJc58qQ(acz74?-^^#iFinn9RRY700e;fj{c%OCf*Xj9vMW5K{)AA`k!o literal 0 HcmV?d00001