From 57d5123a1e3c56f70ee57b539c301278ca2e08ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 30 Jun 2016 09:25:52 +0200 Subject: [PATCH] Steel tools --- TODO.txt | 1 - graphics/axe.xcf | Bin 0 -> 1711 bytes graphics/hoe.xcf | Bin 0 -> 1658 bytes graphics/pickaxe.xcf | Bin 0 -> 1849 bytes graphics/shovel.xcf | Bin 0 -> 1626 bytes graphics/sword.xcf | Bin 0 -> 2060 bytes src/java/mmm/tech/tools/TechTools.java | 6 ++++++ src/resources/assets/mmm/lang/en_US.lang | 6 ++++++ .../mmm/models/item/tech/tools/steel/axe.json | 6 ++++++ .../mmm/models/item/tech/tools/steel/hoe.json | 6 ++++++ .../models/item/tech/tools/steel/pickaxe.json | 6 ++++++ .../mmm/models/item/tech/tools/steel/shovel.json | 6 ++++++ .../mmm/models/item/tech/tools/steel/sword.json | 6 ++++++ .../mmm/textures/items/tech/tools/steel/axe.png | Bin 0 -> 229 bytes .../mmm/textures/items/tech/tools/steel/hoe.png | Bin 0 -> 208 bytes .../textures/items/tech/tools/steel/pickaxe.png | Bin 0 -> 239 bytes .../textures/items/tech/tools/steel/shovel.png | Bin 0 -> 212 bytes .../textures/items/tech/tools/steel/sword.png | Bin 0 -> 240 bytes 18 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 graphics/axe.xcf create mode 100644 graphics/hoe.xcf create mode 100644 graphics/pickaxe.xcf create mode 100644 graphics/shovel.xcf create mode 100644 graphics/sword.xcf create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/axe.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json create mode 100644 src/resources/assets/mmm/models/item/tech/tools/steel/sword.json create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/axe.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/hoe.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/pickaxe.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/shovel.png create mode 100644 src/resources/assets/mmm/textures/items/tech/tools/steel/sword.png diff --git a/TODO.txt b/TODO.txt index 6f08801..3bfa659 100644 --- a/TODO.txt +++ b/TODO.txt @@ -55,7 +55,6 @@ tech.base No Alloy furnace tech.base No Coke oven tech.base No Metal recycler ------------------------------------------------------------------------------------------------------- -tech.tools No Steel tools tech.tools No Steel armor ------------------------------------------------------------------------------------------------------- animals ??? Goats diff --git a/graphics/axe.xcf b/graphics/axe.xcf new file mode 100644 index 0000000000000000000000000000000000000000..e78ae5580f9ebb39c74d38fdc2bf6ac79acfe7bc GIT binary patch literal 1711 zcmc&!F>ljA6n^J8O{h~Sf*@3or7d+nqf5!$8%$`S;Op#@M!&9ENdJi-$=I6k%SGKN?TFkvHmhlh*dS z-;SI8Zhz?cX;&M@2cfsSvzxXRU{9vDvGicYQZw&e40!2eGzgnXFZT9~7Rc!;Qn=bt zFByADui1%4yuROVkD~G7fV}!|Dr53X`5vUHS44#qT;q4cpf{J#ce#-a`@QGkB-$DD zV$NAZ@TF@+SuiJF6O4}d@;QgwI>KOQ30Icz#uB~(%=?;F0x;{%gIi{j$a*N)92&XS zvpi?Dczl;sP@!Le)&UNC8tB<^0HryAn#~&>D$$QXAJ5*-e9$U5Z2)q{&ql|e0hNGW z`V=tw4Gy2S=)mVk4$YCVb%knu|6JA0RO?2yzVC`^J$6ME9P5}4e0~H~WL%|Mb)(~H?8!q1j1)pt#KcFDUYMrFgrOdgw(@nHZ1#OY76~dw- OLg_Qo7A829F4G_28$mh% literal 0 HcmV?d00001 diff --git a/graphics/hoe.xcf b/graphics/hoe.xcf new file mode 100644 index 0000000000000000000000000000000000000000..cceb4840a7e03814814be56933353d7d48c68367 GIT binary patch literal 1658 zcmc&z&2G~`5FY=fp-w~*xQBuw-*6A9+Dk565b`AwsyJ{*X<|E;QaiGZ)SP++apA~~ zM}Rj#k$459oOqBl)O@qqEs3y|8;taMXTF`CnO)CB@#WOL8isBdPXdA*NU;6@&@_A= z0?ij6i5QSafC*T@q14&Wf&UY%2NA+{p^$PK8t`XL9QpM=vUls(rU!;iFgibTEvQ$URfJK+dX2$#vf*apA_v za2(`(J`KY>DDDd6(|=QIX8S0=gB0xpk?{l1_)Rfb)#LM9w&N^K-i*`WWST_m(*XF< zOQ0!rcDyHbEX0q`J}moy((MhswV}5+^!v~`u97_{>b&~ly4obtpG#d84PX8BHm8r+ zJ|x|@Y3Y}Xg^#Kq?H{V@t(`t$jF58O?EG50~-^v52rtG=LDFtNMSvgsEbkE%2E z&Sj>k!1*mPS`i*zXUXuga%{|t?xhQ^dbW5}T~)?;E~!7P|H5iktv2qi#SLJ0>{aMOYSo zZX@zf-Vt$N+(EdA4C1cId0iRn@8h`>;%{rwsUHTla2T}!5qOKLqw%yGc%yzdYV8-Q z?XcPJ_J>|IdDMpCiSHdA942E!a%8A|l%8xT72dl!;nK-y;5VaQ=p9KffYVK&!D_F1 z(b$W6%}y}l`hL4T3dX5GuD%XwWVMvf!3^syj_?7FuqX(ga`=3fyV0=UdohTbFa1ey zFzAK6E{ouUj}dv3^WrU&<3aoacnyyNLUL{-dFe{NeI>tzoc~uw4vEyrOSgq2vX#k2 zIM&+FS24T8^M~ZBE&8eA`D`{lSow1}xhHjBKq0~Iu jIov|KhFc`nXi-dB#7^u`7LkebutpA%T?=eB#<%J()@D_( literal 0 HcmV?d00001 diff --git a/graphics/shovel.xcf b/graphics/shovel.xcf new file mode 100644 index 0000000000000000000000000000000000000000..86e83ff7b8b590ee02616498b3c5be0824b8594d GIT binary patch literal 1626 zcmc&!&2G~`5FR^ro5qa@KS2T^%Qsx4RP7}X0J%g$h#N&K3C1@O zmW4mJ5#`4xL>w4*5Dvmc+%=f@)v^Bp=30WEZKV61Bx)q%v7wZszvMcmC-q1nJ(IMa2y)uI3!-WYWG82=BkaH zCuAFR8A=LvlfJh@x<}U%YKl-Z@wE_u7HU58S%Gt&kU_|o6fA_A{&j`wB2<6qX(0eD zRQEkr;G8F95b`7i3!%CPp+3zN5?gscMTJTQS0zi`=SP>Xz>ZjZ+L=aUX61YRFYlCa z2Jwz~36yihhr^IlW6e3$lyJ^F&W|j5kNAlAf)MYsxA~^k=bd~K^@90@|J6mMQC2kx zU)l_}ZvgK%4e7pK=G?cO-$Ij==(BDTGA$zgLApB#o`;hxx-445rdf#p!hf#Rb|-Ci rR2E)GrT^DT?O)RFMP*@LRC>BnmB>*RxoSqrRW|(Sz>6*$wn9Gu*kUcB literal 0 HcmV?d00001 diff --git a/graphics/sword.xcf b/graphics/sword.xcf new file mode 100644 index 0000000000000000000000000000000000000000..992be7b6612e18075ab6c4ed95f5edc8e0a4b5b0 GIT binary patch literal 2060 zcmeHHyKWOf6utZMYaJy#Oogl!4HF?pNfS{=ZX%(GiWY6`-SrB`Ywa2(u2Lf!s(c3$ zzra60#Sb7+0>Qv=u01zegVSOmai!xqb04#3?#wtzPsYJnFAm~#7!hpCfcXu;vhZ^Y zs2#i_V!&<#F5m%o4ClNS^6z5YO0aAvJqeSjljLb1E<)TQRZOPCC@8XF+TU)dIO%1> zEDzLt=;X<980_xs&TR$RGofvi9)j?8&#_oUU>jU+4KKodoHq zH;4+Z&*Hd9|_r!xyn$Nx5O!I8?v^dT3{?2%ma8?E2 zwrikfIH%SP$3WbE&S7f+!u=9&miR`AZ-Vo>VpR~Smm{|&NMs)vF0zqpKUwzKG0&T1 zcYT_5_4_Wwe#5A{_|mn+Axqg3cImTvrf5-Ap|9#f&Fial3Cb(gX$Gb+ULFqA1(K`u zp}U8Rbyk%vSF?{@(YNel3sX8Z!BRJ_Ch literal 0 HcmV?d00001 diff --git a/src/java/mmm/tech/tools/TechTools.java b/src/java/mmm/tech/tools/TechTools.java index 3121120..857947b 100644 --- a/src/java/mmm/tech/tools/TechTools.java +++ b/src/java/mmm/tech/tools/TechTools.java @@ -10,9 +10,13 @@ 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; + public static final TTToolSet STEEL_TOOLS; + // public static final TTArmorSet STEEL_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[] { @@ -23,6 +27,8 @@ public class TechTools BRONZE_ARMOR = new TTArmorSet( "bronze" , Materials.BRONZE.INGOT , 13 , new int[] { 1 , 4 , 5 , 2 } , 20 , SoundEvents.ITEM_ARMOR_EQUIP_GENERIC , 0 ); + + STEEL_TOOLS = new TTToolSet( "steel" , Materials.STEEL.INGOT , 3 , 800 , 7f , 2.5f , 12 , 8.0f , -3f ); } diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang index 2f04921..0acd19b 100644 --- a/src/resources/assets/mmm/lang/en_US.lang +++ b/src/resources/assets/mmm/lang/en_US.lang @@ -74,6 +74,12 @@ 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.mmm.tech.tools.steel.shovel.name=Steel Shovel +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.milk.name=Cow milk item.mmm.food.milk.sheep.name=Sheep milk diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/axe.json b/src/resources/assets/mmm/models/item/tech/tools/steel/axe.json new file mode 100644 index 0000000..03eaa1c --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/axe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json b/src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json new file mode 100644 index 0000000..78e25b2 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/hoe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json b/src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json new file mode 100644 index 0000000..37a71af --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/pickaxe" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json b/src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json new file mode 100644 index 0000000..e17b7e0 --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/shovel" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/models/item/tech/tools/steel/sword.json b/src/resources/assets/mmm/models/item/tech/tools/steel/sword.json new file mode 100644 index 0000000..839236d --- /dev/null +++ b/src/resources/assets/mmm/models/item/tech/tools/steel/sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mmm:items/tech/tools/steel/sword" + } +} \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/axe.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/axe.png new file mode 100644 index 0000000000000000000000000000000000000000..7ea93a033c907c52ec3da41ac63630736faaedc1 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNn;g4{#&0KH7NAg(r;B5V#p&dP1?(5hH~!;4l#+d~ z;E9~X{mwmp}x6Qv(KZ%FoCeNigfp>V8nLgR^f3i%4 z!t9B>iYK)V(wlSIDqAy{9cEcyzWVT-nx@snTs6ygn%8>XyirUt=9rLcyp)0Ao>4{P UYuDmUK-(ESUHx3vIVCg!0F3`n-2eap literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/hoe.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c194280db4bbe2a28b9c37cac75f8310deffd8 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNn;g3+zk6_}9#AOO)5S5wqBl8Vf$9bGjsN%$r)1tM zcyjOm%G2K(3~#nI6uh1yTHtJR*5!ZtkCPMAB+dv3yz>eFzh3dU@2+eIv*s8^qn4ES x2j=i@nyGVE#8NuVIC7SIuA1P4T;rt-48mS<>WnU0c0h|5JYD@<);T3K0RUZOLvH{8 literal 0 HcmV?d00001 diff --git a/src/resources/assets/mmm/textures/items/tech/tools/steel/pickaxe.png b/src/resources/assets/mmm/textures/items/tech/tools/steel/pickaxe.png new file mode 100644 index 0000000000000000000000000000000000000000..fff76e0ec2ee8952fbf65b34bac0b64c12f005be GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNn;g4{b^RZoTR@>2PZ!4!i_^&o5?dVZANgf(rRMp$ zP5Jvj|JZHM>t9b1P2fptK4N>;<$wB*lYiB3vKlm7UB3E1`$XY?^_$)bvlI1{PFfqB zRY-5nar?%1an{7Syr203*%WT~$e6iEHsl#^Vr1Fda5n9W#<5HWz1bIe6>p|Za-N;y eu+-e)1E5f%r;B5V#p&b(i6DpjM}FD!OkP@f zcw%+J9jjE<%(eq2{;}KG*GL{wyTwp)R$-P3v%`VQK2wa&&VBjnzv+`5nwNP#^LfrP z{`2I)EKjBvW|P;<)S2xlrLk>h&e;=f0VxcY3=CZ*IcE}rvbBMhF?hQAxvXV!T6FA{r5(Z= z7D_kCsj)OJpZVfHkNwX72F?=>w`iQ5`|{O)(