From 5d3d0b8a15a207b0289852ff4aa246d9cb6ec721 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 8 Dec 2013 18:15:55 -0800 Subject: [PATCH] Bloooooooooood --- resources/assets/tinker/lang/en_US.lang | 8 +++ .../textures/items/food/edibleblood.png | Bin 0 -> 358 bytes .../textures/items/food/edibleslime.png | Bin 1091 -> 399 bytes .../textures/items/food/jerky_blood.png | Bin 0 -> 448 bytes .../textures/items/food/jerky_blueslime.png | Bin 0 -> 474 bytes src/tconstruct/blocks/ConveyorBase.java | 6 ++- src/tconstruct/common/TContent.java | 20 ++++++-- src/tconstruct/items/Jerky.java | 46 ++++++++++++++++-- src/tconstruct/items/StrangeFood.java | 26 ++++++++-- src/tconstruct/util/config/PHConstruct.java | 10 ++-- 10 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 resources/assets/tinker/textures/items/food/edibleblood.png create mode 100644 resources/assets/tinker/textures/items/food/jerky_blood.png create mode 100644 resources/assets/tinker/textures/items/food/jerky_blueslime.png diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 562bbf64cee..aeddf5a2efb 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -28,6 +28,7 @@ CraftedSoil.ConsecratedSoil.name=Consecrated Soil tile.CastingChannel.name=Casting Channel tile.slime.channel.name=Slime Channel tile.slime.pad.name=Bounce Pad +tile.blood.channel.name=Blood Channel MetalOre.NetherSlag.name=Netherack Slag MetalOre.Cobalt.name=Cobalt Ore @@ -268,6 +269,8 @@ item.tconstruct.jerky.chicken.name=Chicken Jerky item.tconstruct.jerky.sheep.name=Mutton Jerky item.tconstruct.jerky.fish.name=Fish Jerky item.tconstruct.jerky.zombie.name=Monster Jerky +item.tconstruct.jerky.blueslime.name=Gelatinous Slime Drop +item.tconstruct.jerky.blood.name=Coagulated Blood Drop Smeltery.Controller.name=Smeltery Controller Smeltery.Drain.name=Smeltery Drain @@ -480,6 +483,7 @@ LiquidMetal.Ender.name=Liquified Ender item.food.apple.diamond.name=Jeweled Apple item.tconstruct.strangefood.edibleslime.name=Gelatinous Slime +item.tconstruct.strangefood.edibleblood.name=Coagulated Blood item.tconstruct.canister.empty.name=Empty Canister item.tconstruct.canister.miniheart.red.name=Miniature Red Heart item.tconstruct.canister.heart.name=Heart Canister @@ -603,6 +607,10 @@ achievement.tconstruct.dualConvenience.desc=Kill a mob with a frying pan, and th knapsack.tooltip=A Knapsack to hold your things. strangefood1.tooltip=It smells terrible, but if you strangefood2.tooltip=have nothing else to eat... +strangefood3.tooltip=It seems edible, but somehow +strangefood4.tooltip=it's just not appealing. +strangefood5.tooltip=Stretchy food! +strangefood6.tooltip=One vampiric appetizer hambone1.tooltip=Hambone! hambone2.tooltip=Usable for Beacon bases metalblock.tooltip=Usable for Beacon bases diff --git a/resources/assets/tinker/textures/items/food/edibleblood.png b/resources/assets/tinker/textures/items/food/edibleblood.png new file mode 100644 index 0000000000000000000000000000000000000000..4809b05b6282c97c8732c46944f6c1b17d548c78 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)4=1C#**QZmL7<}g9rs5A&M5R1z*Ca@FjxQzD7_4k+^ae12SWz zi-d`bb7`0sqct(Q)wtu&Y t>kc2E)D!R1(GXz!B4r7!ktY5hd;;_6Yo{oOPHF%E002ovPDHLkV1iO=sj~n8 literal 1091 zcmV-J1ibr+P)jnY*%jIxDnL%_F93RDULjyGMT6ewy|l$VB> znYd)m&A6V4K;S?6#i&>T>`y;-4&Vk#tRTo?8_6tvPa&K>%`~95nIp^t9 zm1=P{M8~>=5K+N0q8pRg zc5R%$V?N%)Ve}tjQQe1oVemFV<0^%=+znG<0TLXq!|F(g9$3R@;FhV278 zuTNm57(>e3a^e#XqyJ-JeKnHy@8hfFE`zSL1m>-UP}^;=*ws-2^qqt$(80}CH}gZV zCrCI)JX1Q~bS%IC)C0QO8g4$yp2G0K`;ZIrp%xBU98m&f4E7_XwFPTVoq+%6S-ddR z_sH$n)DvL)X$rJ8BJ(mgBxf-ag}7n+HfZzSi_L-T(E+SFbPyKt^8Dd*$Pt}yJ#+e@ z*{AK7qutN8OTu=IvxotfzWWXmw$GO!GYS9-%?1Z-M~@&?%(b=sFxyN`$)!>356q39 z!RLj(xsm6eI-f={QPh4ZXP*hPJ%%lr0OZaNq>7HVG<#qcyBu}5ETBkqnfCznqD1;8 z4`1izUzDKK2_tPnqV_uBg4&h=vrQe_Z-F^y6GKp>G}J==XurtR%cI5{jj&wb+Jr>0 z+0Z>To+R$ALO7+w8C~romtq+^AsQ^HssiaE+hkAUT&IgVlif6uix6=~wx`uf^1 z@dW{F@_8771fH#{<;>;Eau#OG2|{E|E+o5M3_;&t;n1jFbZHiTFbQ=+0U>dQAn|z@ zsNTH$D6Qi7q)lXTT=` zSXZu9Pk3(l%D2%57b{_%AIk>u;nHQ~|~{OgaDn002ov JPDHLkV1mVV5FG#j diff --git a/resources/assets/tinker/textures/items/food/jerky_blood.png b/resources/assets/tinker/textures/items/food/jerky_blood.png new file mode 100644 index 0000000000000000000000000000000000000000..60f71259262bd1cc80c9f6bd9d2b71043af90625 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)4=1C!sM-`wBcPCMW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`&^D>Eak-aeD3K{a((7BJKNccTX!+3m?d<2)<#>S3L4`%a-X&);?&Q@TA;t-xC!} zLAl^d_6^lcehN%4Dw4eI9N0H_KHApk{6I{m-jwxD`R;d2bD{*pKk0@XD3uBJ73z6m zo2kusbZ*?`Dg2W19{pQM$X!t^O3E~kR|9S^Kg k>ngs+SYvOrc&_ibxWE8e4_CVO>$uAX@y?z3Z2nci8=(vv%$Ul(ni zyHux!hhfDJJ5hmsD?fhX+AGJPy)XRPOU485GFqNiPBmdKI;Vst0L7BIeE