From 5cce96c8e1f2bf7d4c092028663d796bca8accdd Mon Sep 17 00:00:00 2001 From: Zachary Daltorio Date: Tue, 1 Oct 2013 23:26:36 -0400 Subject: [PATCH] Added Tainted Stone Block, Added placeholder texture for Tainted Stone Block as well as added working placeholder textures for testing prior to compile. --- src/divine_equipment/Divine_Equipment.java | 21 ++++++++++----- .../textures/blocks/TaintedStone.png | Bin 0 -> 818 bytes .../textures/items/Blessed_Sword_Diamond.png | Bin 0 -> 446 bytes .../textures/items/Blessed_Sword_Gold.png | Bin 0 -> 513 bytes .../textures/items/Blessed_Sword_Iron.png | Bin 0 -> 469 bytes .../textures/items/Blessed_Sword_Stone.png | Bin 0 -> 504 bytes .../textures/items/Readme.txt | 1 + .../textures/items/Tainted_Sword_Diamond.png | Bin 0 -> 503 bytes .../textures/items/Tainted_Sword_Gold.png | Bin 0 -> 467 bytes .../textures/items/Tainted_Sword_Iron.png | Bin 0 -> 460 bytes .../textures/items/Tainted_Sword_Stone.png | Bin 0 -> 474 bytes src/divine_equipment/blocks/TaintedRock.java | 25 ++++++++++++++++++ .../items/BlessedDiamondSword.java | 4 +-- 13 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 src/divine_equipment/assets/divine_equipment/textures/blocks/TaintedStone.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Diamond.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Iron.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Stone.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png create mode 100644 src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Stone.png create mode 100644 src/divine_equipment/blocks/TaintedRock.java diff --git a/src/divine_equipment/Divine_Equipment.java b/src/divine_equipment/Divine_Equipment.java index 45114b2..a2e8e16 100644 --- a/src/divine_equipment/Divine_Equipment.java +++ b/src/divine_equipment/Divine_Equipment.java @@ -7,16 +7,25 @@ import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; + import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; import items.*; + import net.minecraft.block.Block; + import net.minecraft.block.material.Material; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraftforge.common.EnumHelper; + import blocks.*; @Mod(modid = "divine_equipment", name = "Divine Equipment",version = "V0.5") @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = { "DEquipment" }) public class Divine_Equipment { + public static final String modid = "divine_equipment"; + public static Block taintedstone; + + + @Instance("Divine_Equipment") public static Divine_Equipment INSTANCE; @@ -30,7 +39,7 @@ public class Divine_Equipment // Init All Tainted materials EnumToolMaterial TaintedDiamond; EnumToolMaterial TaintedGold; - EnumToolMaterial TaintedIron; + EnumToolMaterial TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 75, 6.0F, 3, 19); EnumToolMaterial TaintedStone; EnumToolMaterial TaintedWood; @@ -49,8 +58,9 @@ public class Divine_Equipment @Mod.EventHandler public void preInit(FMLPreInitializationEvent event){ - - + taintedstone = new TaintedRock(2550, Material.rock).setUnlocalizedName("Tainted Stone"); + GameRegistry.registerBlock(taintedstone, modid+ taintedstone.getUnlocalizedName().substring(5)); + LanguageRegistry.addName(taintedstone, "Tainted Stone"); // Tainted Tool Material Properties (Subject to Change) // Name, Harvest Level, Uses, Dig Speed, Damage, Enchantablity /* @@ -63,7 +73,6 @@ public class Divine_Equipment */ TaintedDiamond = EnumHelper.addToolMaterial("Tainted Diamond", 3, 1003, 8.0F, 4, 15); TaintedGold = EnumHelper.addToolMaterial("Tainted Gold", 2, 20, 12.0F, 0, 27); - TaintedIron = EnumHelper.addToolMaterial("Tainted Iron", 2, 75, 6.0F, 3, 19); TaintedStone = EnumHelper.addToolMaterial("Tainted Stone", 1, 88, 4.0F, 0, 10 ); TaintedWood = EnumHelper.addToolMaterial("Tainted Wood", 0, 40, 2.0F, 0, 20); @@ -76,8 +85,7 @@ public class Divine_Equipment BlessedWood = EnumHelper.addToolMaterial("Blessed Wood", 0, 59, 4.0F, 0, 15); //Telling forge that we are creating stuff - - // Tainted Swords + // Tainted Swords Item TaintedDiamondSword;{ //Create Item + Picture TaintedDiamondSword = new TaintedDiamondSword(2560, TaintedDiamond).setUnlocalizedName("Tainted_Sword_Diamond").setTextureName("divine_equipment:Tainted_Sword_Diamond"); @@ -96,7 +104,6 @@ public class Divine_Equipment LanguageRegistry.addName(TaintedStoneSword, "Tainted Stone Sword"); } // Item TaintedWoodSword;{} - // Blessed Swords Item BlessedDiamondSword;{ //Create Item + Picture diff --git a/src/divine_equipment/assets/divine_equipment/textures/blocks/TaintedStone.png b/src/divine_equipment/assets/divine_equipment/textures/blocks/TaintedStone.png new file mode 100644 index 0000000000000000000000000000000000000000..476617844f70601d41964d5d90eef67280a29f88 GIT binary patch literal 818 zcmV-21I_%2P)4Q_ zK~y-)J(5dr+eQF{Ka$HOm(-fJWIM7OxoD82hunMaKj>d?4*~iJT=*$bZ&4H<%jL2M zx1HMn1I#zTct8L2%aC4KoO4_RpRv}W-j)3M+k)BjBew6@9&*wvOHmX^DLJm-?&cFR zj1bv*ig7#i@B!x>+e3~DTV~UbY!5ltlkbRSf-5{mBZudCoKI(L_6q=f6YPk)_smxh zl)AVsDejED#OFa2WY})#@Q9aFwnF$K@hOoy-+t5 zu}lE4(Hh_PQFiv`)e;-65we{U$%Li*3JFASdGtHSF^A*uh){y-_zSJ6{zZ?7$1Ua% zBhuuI=fyp?kGZ?~gy~vj7;)&nF{qmH*_cc5g>A8;i7yQ6xkKoRn3yC<5TolJJ$&Flt?M}=D;bL)IaLK->~nc>!|}9ZeaN}F zyrVS@LLRZ!A^=vq7Xn|@;)8`usP(UO0#PIAj>im`&R0gWl5k* zQY`@}c|vPV-}hYIMQpm?S?yj(m8J{VWLfq<@p?B$1VKO;h8*fwf>D5$8f9n5Fk-oQ zp)nzTx<+eFjOHTv%yRRB3?l{{LMcVm-6DO5>m8MOratCO&Zk5&=4yP)Fbo{Ie>;%1 z48uTc8vM}_U)dQV2r*qt-JVF(6g4sA)mMV7;A!!V&3-|>d7C(2J&>M7xS^--dxVKz zv3pITG)=K&{bYz_j2I-w)aYvu=L%er0?>9fg(*S7Xf#4Jo0v|%Qf^aXnGngCLG966 wBikR??sEXTaLt*VFq_^H_=2N%PqmW#11E50bT&;_=B9Hhd?2@%#er@=ltB<)VvZPmw~}4C$+dZ zHATU*C_hgjxIDio#dOj>pg5zVr;B5V#p$_|480FKNVLu0UADUW=DPomh1cQ}98NrV zpk`t1F`bQzk5y4`-MQE!8-oKUq-1`Z^{>5bVqTW)o97eeEb(2mHiPy8)*6QUp#>`&Jd+qLV^FyH$5!^Y=XuRGVK&184nX7}vD zn~jH>Tl43nl=s>8;Kb(<}Gxwp=fo+u}CQNqKvD-xbg0+df>nxW{kbi!!lQeGbA85^D~=J6D@4 l;V@H0Oj>Gzz?A>5*iY|k*f}RVWCbV~Jzf1=);T3K0RYV&x$po0 literal 0 HcmV?d00001 diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png b/src/divine_equipment/assets/divine_equipment/textures/items/Blessed_Sword_Gold.png new file mode 100644 index 0000000000000000000000000000000000000000..ee1c92d35f0762f1bb5b9b3b018aaaf450d10d24 GIT binary patch literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)r>uyG%8{uBUO*wa%#er@=ltB<)VvZPmw~}4C$+dZ zHATU*C_hgjxIDio#dOj>pg3cSr;B5V#p$_|d^KDWMcU@)dz|XJ8|%CBrC#2esW}lE znKvR%TvG`%I{GAivB;ujJ#z)Uf;R<9S?93b+<95#s*t_xu)2TT!>?Px@iM3Lfi)Jk}GNx0_p0(fBH6wYpZyq-$mc{=H7G9R%jPD!-b?s%O9_{c_)hY z#cVjTw=u!_`(aatlOd<}%BQbf%IdO2Q;KuX)yhjI^XERhxBZF~`T2h=g zKleliZI9P!ui}vKDKY&7VnIRD+&iT2ysd*(pE(3#8PHJ&+ zYKnqqQGT96aCv@Fis__%KygM3PZ!4!i_>!_ZS-~u6lvdIy>{C52}+H@0vv~!7q7jr zU!f`LevZ&ZAwAAqUsD!GF%HWsN+#~fy8ac}O(L9Y`NG(OoKuz`ocHC+UXS-B7T@dc z@BMx}uxG=mr;~P+W{BJ{5$^GK&orNZVetW7g+G^r9ov(ycCoQca5FMxxSsVrBFyb2 z!;G5kA`Ywv_vxQ_|E{G${{X|i=Z`keRgg$n6Mv!4&5rTXLrsQ%O|`5HuV1#t{gpm9 zlT&teScXdQ-rD;-UE7>5mf3vB{d>{;1EXW2a{8I_cMLl=$mZMK4QOUn64DgilrOyN z+`qAG2UQ4|JjyFFmS2UH%q(Ej%)8F{{IlP^FE_RbgWc^ZEuy8QHU;sJWxn3GbEzKIX^cyHLnE7Wngg1Ni8l; zO;PYH%Fj~>F3&GYF`cvzD9#w|>Eak-aeD3~dk?2Tkz@7WMfIGVSrt{bMYt@uDRM*P zqJX2R)pQrWiy=YIf!?{U*QPl4=4Tp6{d)ZDT7nzPHWw+WNasNPCD(HeSgY*}&wnYj z*#Exn`yK5Sibr?VT1 zcgi$6IB2LD9Bi7>V9>0s#<5P%l;M7Z=#LLozeM_`kDKf6J$^9*fW)P$rL4-PxjWbmFx0L&CL2)4pjbOYWVw6 zkeR1p)heNc{Aw?`H$5j?cV65y<8t@s(E8;8p`rWi<~=BRV%fKEir>1eA`Q#7J=~SR ruyN0B)#|9+rETl>bI#A-l-4Z&@$J@Di8dop#4&if`njxgN@xNAUKYt3 literal 0 HcmV?d00001 diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt b/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt new file mode 100644 index 0000000..f3ca66f --- /dev/null +++ b/src/divine_equipment/assets/divine_equipment/textures/items/Readme.txt @@ -0,0 +1 @@ +These texture files are currently place holders. \ No newline at end of file diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..9370aefc247faeeebaf14db40a8fc03ccf24eed6 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)r!0@A#R|`9KzRn)%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK6_|fq^mF)5S5w;`H1}`@NYGC64cZzfk75^%Ql9C3^pu9S`en zzxv?9BN5%azl>}D76{9{)6eKyq0y9aaiyWpIe|Oxq-2zynryH!RGB)j?Zpmj(>-z( z)4xCbTs!aiZ=0SD0hKa+KidWYk#*BfYb<*NL>qX77cTgaT_(M8^XvKkmb+#&$oriN zWN^@oPgwZ>z|xvV-6xImVIiXW`LQ{&Z>`<@N*APR`EA%b^SWaCv8)gyg2agRR3FPGyew01bP0l+XkKF?Y>a literal 0 HcmV?d00001 diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Gold.png new file mode 100644 index 0000000000000000000000000000000000000000..a64073a1ee4c9103a2cff7b23979df1d607ae702 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)r>uw=bMVULi-AJ2nIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V#EyQgnJie4%^0|TSEr;B5V#p$_|HhLXS5NSOxFXZ%t-M5`@VdO5$olhBG zUAWj++4D%^<*lXu5A=TM?{j?lC?HC+M7Uk7C9Ef8Qk$0nZ`|^hC5AUD9{5dvf2Ue+ zx}e~yjLkdGFcyVYSk$zqRx&Us_B`g@^r2)``0WP*aeAf<4Uc=!0}=!9#+O?wZX zLly_ZWfm&dw;S-VT+G7GP-o4n4mBJ%!%Wo8?0_!a!V^7rb3f+KOe{idx< z+SV2H<7TynZOOR@zaC8~@okz>|0r)?a`)RO=jA7E-jKRVlSg6hpC4uCPw_}F6h*0D zFy-7FI^~dicd_4`;!Wo*fqoJT7HPG3{-IXhB_!9XLH_dfE6l&*e?10;t*5J>%Q~lo FCIEq7zfS-F literal 0 HcmV?d00001 diff --git a/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png b/src/divine_equipment/assets/divine_equipment/textures/items/Tainted_Sword_Iron.png new file mode 100644 index 0000000000000000000000000000000000000000..eccd0935d37a1985bed4078d8e55f09789fd514d GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)r>qFCK%JuQbD)rHW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`$tW>Eak-aeD5g{a%LyM2_v37CQ8lPpaMTo8%oU%ghDY z?(q-vtT?^qFW?ur!y0?%t}LG`*Ucjf1s1BN30zL#Sa$I7l?z*VbE_Wswcr2#yokkk z@yV9N2*xwD4>Yx zOj@5;#zZGxSX@+D)$5h6)bx6nf>Mr;!3#n4i!z=j?k0a%ap*4+zW9wRa^i#SCqC4) zZoPNffT826^Dph9FS~WimNfRil`EnXMb#$Z(26zue)O9x6Iro?`gTeKR(NT zmr_A>-HASv4=qFC-hKxIAE1zIW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`$td>Eak-aeD5g{a%LyM2_v34sx>S*yg-^+Ha1$xpPWh z+&XwL{KT_0UpRj;9E`niR5xECs7qv5WINwNU5On@(md1u9ejMnd-9eW6%YKT-!DJ+ zeXjBhNmnh7CXocu*7n1STdrM*O16loW%f9!s6^eyRqGCU5p1U+}YS4rrC(W(Z+;hXGKh9{ih*F$Yx2(l{vG&p+ zu_NDPb6CDu9ZOmpSeRw8tLEg-dwLUXm(2ev^fqnk>2<9IRqb8DhcoUS{(JkYUt>%M zP*l2<{qM<32j0h@uWt6^yc0L4;O5p379JlAeuyoue1Beg