From 59d3f515767573853f05b59981a247b68016231e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 30 Jun 2016 13:18:30 +0200 Subject: [PATCH] Steel armor --- TODO.txt | 2 +- src/java/mmm/tech/tools/TechTools.java | 5 ++++- src/resources/assets/mmm/lang/en_US.lang | 4 ++++ .../item/tech/tools/steel/armor/chest.json | 6 ++++++ .../models/item/tech/tools/steel/armor/feet.json | 6 ++++++ .../models/item/tech/tools/steel/armor/head.json | 6 ++++++ .../models/item/tech/tools/steel/armor/legs.json | 6 ++++++ .../items/tech/tools/steel/armor/chest.png | Bin 0 -> 236 bytes .../items/tech/tools/steel/armor/feet.png | Bin 0 -> 214 bytes .../items/tech/tools/steel/armor/head.png | Bin 0 -> 202 bytes .../items/tech/tools/steel/armor/legs.png | Bin 0 -> 197 bytes .../mmm/textures/models/armor/steel_layer_1.png | Bin 0 -> 1121 bytes .../mmm/textures/models/armor/steel_layer_2.png | Bin 0 -> 672 bytes 13 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/armor/chest.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/armor/feet.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/armor/head.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/armor/legs.png create mode 100644 src/resources/assets/mmm/textures/models/armor/steel_layer_1.png create mode 100644 src/resources/assets/mmm/textures/models/armor/steel_layer_2.png diff --git a/TODO.txt b/TODO.txt index 3bfa659..d0a7db1 100644 --- a/TODO.txt +++ b/TODO.txt @@ -55,7 +55,7 @@ tech.base No Alloy furnace tech.base No Coke oven tech.base No Metal recycler ------------------------------------------------------------------------------------------------------- -tech.tools No Steel armor +tech.tools ------------------------------------------------------------------------------------------------------- animals ??? Goats ------------------------------------------------------------------------------------------------------- diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index 857947b..f5db81f 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -15,7 +15,7 @@ public class TechTools public static final TTArmorSet BRONZE_ARMOR; public static final TTToolSet STEEL_TOOLS; - // public static final TTArmorSet STEEL_ARMOR; + public static final TTArmorSet STEEL_ARMOR; static { COPPER_TOOLS = new TTToolSet( "copper" , Materials.COPPER.INGOT , 2 , 192 , 5.0f , 1.5f , 16 , 7 , -3 ); @@ -29,6 +29,9 @@ public class TechTools } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); STEEL_TOOLS = new TTToolSet( "steel" , Materials.STEEL.INGOT , 3 , 800 , 7f , 2.5f , 12 , 8.0f , -3f ); + STEEL_ARMOR = new TTArmorSet( "steel" , Materials.STEEL.INGOT , 22 , new int[] { + 2 , 6 , 7 , 3 + } , 9 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 1 ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 0acd19b..b9a4fee 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -79,6 +79,10 @@ item.mmm.tech.tools.steel.axe.name=Steel Axe item.mmm.tech.tools.steel.pickaxe.name=Steel Pickaxe item.mmm.tech.tools.steel.hoe.name=Steel Hoe item.mmm.tech.tools.steel.sword.name=Steel Sword +item.mmm.tech.tools.steel.armor.feet.name=Steel Boots +item.mmm.tech.tools.steel.armor.legs.name=Steel Leggings +item.mmm.tech.tools.steel.armor.chest.name=Steel Chestplate +item.mmm.tech.tools.steel.armor.head.name=Steel Helmet item.milk.name=Cow milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json new file mode 100644 index 0000000..c414a89 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/chest.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/chest" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json new file mode 100644 index 0000000..d139f1f --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/feet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/feet" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json new file mode 100644 index 0000000..d4c10dd --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/head.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/head" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json new file mode 100644 index 0000000..22602c0 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/armor/legs.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/armor/legs" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/chest.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/chest.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d7b86529ec0e5834219650c6041d22653ddae7 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*OmPNn;bVUr>dc^8c?Xx)5S5w;&gI?M2SOO-^gZOqZYlDJOcG($~dnF zR~PJHS;jCsO@g8GVF&Ye6~D0 zCz)+f;8ys#-Z63Gf0xXA1yAH87E3!^5J+L(kg0ZyLBQ>swTG}LTSG=*UYQ7waf=;W pgUG~GhBE>=T@Fbsru_j740$IeDqX#Ia|O@}22WQ%mvv4FO#sGzJP`l@ literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/legs.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/armor/legs.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fa1a156bb2b73a1938bd0799338a1bc06b37b6 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNn;bW{X$;FWb)Zm?r;B5V#p&b(i4upn$iMb>J^{tg zdrU0~-3mX~J0@=Y&%%47;E9|>a0-Kmp^@52h8b!Tk_6OFGo-ZcIO5K`U@GH@Ko1X@ j)r=cj literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/models/armor/steel_layer_1.png b/src/resources/assets/mmm/textures/models/armor/steel_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..260931218382602b47c848a0b90305bbaaebce26 GIT binary patch literal 1121 zcmV-n1fKheP)FIOPFC-8JG_ib~?$7U~@m4oYuAZg`i`~S##-RTo_T=J6*%mvW()`Z* zw9xq&%orL5v`@aL*4}wE7%;v5Do`*q3_#)wyB~u1*^M`8cJnOVp4u3E28=E2mxMRB z-=(>&vygss>+NvZ0Ek^W_#C<)D99Rp=7z=ys`ns(1|pc7e)@9o8Gxln(lm@7dOzCi z#CWv1+y4x>JG-6Ga~gjB(UWK4-XIo2X%j0aLGZ)nqv-Q)eCaUa0p@J%jWt=!aBprW z-I?BuC*NS6@ACA#o?sw^>EqFBpsu@vNZ*GFWQGsxKePTijG=_N-+kDK<%2K5plTe! ze)g$OFsdgY9>njTN5jZz?U9laqkf;seeL;4V1g(-vpbH~Ae63(4~c*F=Ou5Km*x;0IC#a{~pNc@Qi9ApZtKU zaX>FXmb(~(piZ?INsO6+%uO=@Lyb2=Ftuc(7%y};vcMjQ{c+0}(>xHXA(BM;1T3_x z++CNHf!9PS%m>-h%B6#bR%*JP+|GWNLryiC3<$~xw~->;5q32-cu zaG(SOMdE+6K*lf#=$bgGHYQ_Hb;{luHDc+JFn!M8`_=P=x%_;)TS73TT&X3RXnA2(0wN-NEKsC{XFcC?kM#z1opZy66il(cpbD|C78QWYT-NlN zLnR)j099)VW{1o}C~JYWbp%mhs|CVv5zZnBp7wEh=&+Y227vR9srJyW8v)nPfOcN7 zSvkBY6BWi-Yan%NaxK^COrN7p(E6q0K&|f)08v(OI1s5S4KB;2<9~pngawnls5L^v zWZuCL-bs*5V80R%zg^S~V8H5ej-cPGMzutG;l{GVN;g&{8p4r&6|x}4%fg(0#RgV> zN_1QjwFP6_IrBo*>P(r#FBgA!glowp>Yt!U3g+<6A}F@O>ds{l)iP_nd%9wy`_QjO n2wEwBLyYR6vJ>CBa8O&F;&lCW900000NkvXXu0mjfcB~NE literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/models/armor/steel_layer_2.png b/src/resources/assets/mmm/textures/models/armor/steel_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0b8174c3e56235d2b5de212fc893a1cea25e16 GIT binary patch literal 672 zcmV;R0$=@!P)VGd000McNliru;07KG4lq#}mhAul0xd~I zK~!ko?U#v80znLhd2*vDA}aR{3Uc3yXT%c?&*7`o{i z#EBCpPMkP#;>3v)Cr+F=3B4q$GdVuFlvLwdGOara9RWwR3z@Gzq&$2T$Os()>E?~p zChw}OLq`DV5Afvam5>b^4|p%%msnvShqZIbwePk5lZ`L%iON*V;GjHJpZ(%U6<_)T zeIoD#04CpENU{HEe|a{lywD=ivUq|JXU!(qrrnpdH>j7*XX=*6{%o&31nd>K#t+ z3H7r>t1p{=a*yDF@;rMRowlG6E0)<{AA3rLPzPyd#4s zF$l+>tis>=4|@VJW%LHwS@=D}2q7cvo5G(mUe?&XqB>q`HbIK@AREX0mrbF6PXHxk zkpqlfq_DMYJkWp#BpIUqUUYdz%|jsjAq{_Qe9?7$i+lnn$S5;b&>orq0000