From 46ca83023406faf9fc3cbaec6596c5d57eac3aa1 Mon Sep 17 00:00:00 2001
From: KitsuShadow <spikespiegel19@gmail.com>
Date: Fri, 29 Jan 2016 06:12:48 -0500
Subject: [PATCH] reduced_shit_lifetime

---
 bin/com/kitsu/medievalcraft/Main.class        | Bin 6767 -> 6777 bytes
 .../medievalcraft/events/EventHandle.class    | Bin 16421 -> 16421 bytes
 .../item/throwable/ItemShit.class             | Bin 2101 -> 2927 bytes
 .../java/com/kitsu/medievalcraft/Main.java    |   4 ++-
 .../entity/EntityShortLivedShit.java          |  25 ++++++++++++++++
 .../medievalcraft/events/EventHandle.java     |  17 +++++++++++
 .../item/throwable/ItemShit.java              |  28 +++++++++++++-----
 7 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/kitsu/medievalcraft/entity/EntityShortLivedShit.java

diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class
index 70a766c5df5c501a1751bb5a7c002e7289879722..df738fb54da0e9ddd0f2516ea494d73f0b63188a 100644
GIT binary patch
delta 387
zcmYL@%PT}-9EP8-FsBiXqlP2N21UuOlqiyg`(?)cmYRcc8_pav$wscRu=y<Qlp;mh
z%*KN953rK^WzWLK&UYgEt)921_x-(>eU+WWJaQ$aM86Uw2W@k@ITSFbYAh=hl^-4{
zuM!Qpo061O@Au7`BbLUUAkp!D0~Zg10$Hr3J6fjS4BMu%o&;{k`e7F@g3>?9Hy*O=
zreMSj_{M{_#+yKMWQR^0^|`qCYTVSyb8m?#KmGIyQP+fv7Ia$4rj0_{sicDjeDvUF
zj7}nSu|_vLD%qotefl|IfFlMuW{5L}Wkvc$L43Za+T)IkajoCzw+a7ruRpr}=~;i(
zWS)^*6;R8gq^XTOf)p`96_aXtT6NE;3$cX7Heq(LIb@y~Q7%~El0~^?gpFm@utE~6
Sq^b`M*2!dp95$slqxT!$EoY7Z

delta 381
zcmYL@Nhm~d9LGQZ8s0Pv&$G?L!39|ok`r0tU|(kJONoaOX1p0DPS)I9{*G=+ks>a0
zaZye#;w1Z$tFw~4k<#z<UHX20pQRtAM`2au%3`}q7HILRH)!WdVD|=%Y4?OTD8E!G
zkDa;|I^}~Jn|vpTi-gU-QDdswG<_k32YDHj9%-c4d)$6w*tGK`h>6tx422hYnNXDU
zCU8V-j}ZtOroy`*@0VSfq?{~jO}3~?9Ms5*loC;P@|_|?T_Xz3Xta<?D}}UCPCE^B
z(1V+CJj~O{I$dnh%?`cn(#IbC95BEkgPbxXYh7pgwmh{;b=bmOYd6|$)W5pd9;5%&
zv-YaUVm-TJ#3CD{GDZ#)6yc?UNsByX?M^de-4cE_nPnT3eFB7;<BSmJEXXZApf6bq
W%Q#sfkyUio$gn=mVnb%8_5J|e>SPxH

diff --git a/bin/com/kitsu/medievalcraft/events/EventHandle.class b/bin/com/kitsu/medievalcraft/events/EventHandle.class
index afecafd3ca188030d71ef454910e9c520c2ffc67..23140f6b8fb907c77826d7a52f40356f2f7b953d 100644
GIT binary patch
delta 1172
zcmWNQYf#ly6vfxt|JPMh1|1cx#JHk$c_e{61i4~jpg@SAh&&b0c$%a^Dqv`7S}NCk
zkW4m-Lrs8sec&WhMou}A<s@PWW|j?EjT$!8h*Rgw`LNFU&8)N5-c7Y^s^wAFq+wH`
zBM=^#>N+@S^Vpg2LL__<1%J#!7@{#7G42`OMN%^l!|@zOBMy&YzPet35G1IFN$Pwa
zOOT8_q@V(eP>ob<#bPulwF&8HLk7-a8M=^(E67Gaaxj2gJj8N(U<D^4pS~z$7*=u)
zRxuGp%t0}WP{Oq+<LfAAy#uS+h&4Qd3btV#&*5cup^`mV&l}jlU$K$*P|YFKx#E19
zJ-1>Mwkf;YF#$X9ICi;dFSpfvgpp{$c(lS>`3lA{IB^{DaH9|>P>PdSk5kx%(>RQF
zbl?mI@i8C4S>>=px%xyo`jk6yju+6$>-e05I4?o?LgwL1$-xCVfUl$tU2*|mYZ|`M
zyzs3SgiBg6zSB0<;Ih_$ZtXI9wA;9<>-b)e#x;Erdi4_Y=|}LReik?MZv13;;Ag`Z
zzZg#3GOEyT)Z#Z|CvF>u@w?HEKa5NG(;R_2=49M8BXG~Gz<{|8_s#e5x7mk5^Dq2k
zjljQFEFM@H7_utx(DG=(e^w`9^^vymw7EC>`wgpcU?lx8p8oJ=0D}26oScpYd<JO@
zR)vIM3uj;lL(!m0YGb(idIWkolj9ggKhEM@Mzfl;xrZ@q<s9}a<soBb9Op?g<D`J`
zQqB3&&IGy0MCoUe=EGzyj0?5o8m4G(FjYImH0=x*YXeNzhjFQHXNI1|OnnWr^zF>n
z&ofuQ#ytH#mm7i1H|Day$Y!CjpD!5ivdCy<vC+vAqlcx&U6z>+t~Q-~(M;zWvz{-R
z&0K4K#&zZpD=kk}Sq{Ep<#U7OUB!)7J*%xQ)>=2Y$r|FTwoq=d#qu><8sBuE58cgx
z-72Jd6_QJZv<D8pjUettB=;eS`;o;1Y7iT+mk04454-Ea0~yq;kPj5{p+Z^|(yEX)
zg&ajTkD-*uv7K(b!xK2glWL?oTsI>cJufTj3MTR@rtk+$=XKYvnU?}4W4Jtl(PGC0
znSyEJivXF5FqsCYJc$H(3M<5cV(~+{1iRjf-0T?&L&7jd!ZB7t;UkeQdsLlgv{Ic)
zoeeLEhOa#9J{>hiYUV2`0gp-|?2-h3NkOorVxgqLB}>pK>9{CM(JdM1m1VdknYbg_
zcp$kPC3&16%W0Pt^pkvssIp^ZCDUaU3#6EpQo=eZ<xVN%J}KuRS<M!yR67W@bHf1@
Ki<c|j+510gks7}M

delta 1172
zcmWNQc~I4L6vfZEzYR1cAZ4kffnH8*h9HPw4-!-a1Vj{3AVOR~A|+Eoco;gCI)OZM
z!I*3mqe(!0rc|~dYFb2DE={62wvjby>O_-Reg8f8`<Xf4bI)z9V{07`ILEl#pd$<(
zusL5Jvu;!@d@%_&#32;%h{0qeAi*^upi~^m7>23v!ZbXD6g8fKD5R=K=}5y&%tZ!@
zkcCRjLM^iKGIG$2IcQarPRv6$^3aR<xPW{Npa8c~h<hla2cDrnifKa$W3Y%%VKLLO
zl!Yi|DayDK<=lX0*%XWlwqQB;VFf#}lHGWLy;#MIc#&68&7ZM`f1-v%c*!|Eu+4J=
zMk*6t*a$yt!oz5AF{r}L@eW2{KYY-R0CXS{2VloR^`Apn1Q*J27}a<ejW~k6IEoL^
zg+aW}`|yEscucwaNICkL4fup-aGY1r!$F*o2%M6s_*4pUT6W?y>BQ%92ECewKFt?j
zY7zKKE5p~?S_i(-nsH7$hYQ+uT-0@Zt3QeF^lV(xm!V(Zhb#Iqe6OF!Rl@_<3>$th
z?D)~B!Y@W028;&$YV5^zqYJ+oXYso^9DkUP;D#BCn`R|$nXllsxd(U5%lON@g+XgL
z{<f0wkClhJRwafkk9PcP_2572GU4V!%T*H^;_i4HBNz-Hh9H2Uh-5hI9EVg!Acy0z
zgppX!C~W2gG&35VYEeC$h<?U$G~*b;cqVZ&YiZ|JCa{Bv9N-k*W0H(!vSf0alyJJ#
zGDW(WDt%0o0j6t#%+O+(sbxBtrEO%kwwtrH_n4#I=3L#Kxq1-i>G_<muiyfG6Z7?x
zEYvUYY5fk1jBpkkNnB_Yu*BHGCB_?EYILyF=wX?0k;{ymEH{H$VcPkenaky76D!R&
zK5ri9N^^*-EKjbsf>~uPWVIDg#WhwFYph;6tZS^ZhPc)(n(N$>x!x^@n_VZPw=k?x
zg|tP5)TBakBA8nd!PgMSZJ5dJ$mb4K!kyU0U3imwT=f&f8S$1v+7$A(LiQ`9T_GI`
z=|lk!sA3<)CLY2rx^RSt(amGdYq2e!ClqxG{ydFGRmq;<7tY2>XTv-&Ozwx5c)?G+
zF;*Txn2bV<jD}r&kS4w;7C)4UKPn{9`D)xcPa6z*4Bj#pqr`?l33dj>*L#L3HC(CV
z;45LU$#~b%cyDpUDk%;RN<4yOGD0O0kun8Yk_4w}c8g3ypG?PjNkPBNz)zBj8<LK@
zlEIN`!G4m(AeqGw$!3(yW}?htuFPeL<Z-pkXT2<7gXD9&6mYi`vRxLd8-%*KVStLn
J*O_AP{~xb*7b^e&

diff --git a/bin/com/kitsu/medievalcraft/item/throwable/ItemShit.class b/bin/com/kitsu/medievalcraft/item/throwable/ItemShit.class
index 2c85ef27b3182306baa72550a0747440efd36513..48cea03a697a466620115c6840effca722f69904 100644
GIT binary patch
delta 1023
zcmYk5+fUPQ6vw|m+O6AC1xB1)6cvpD88(XJA}S~Y1;Gm-uz9UpkpgRh7388$@s4=?
zJ(%$1n~Cv34MQV|@!9Af;iFGJ8efd39S|OR`s+D8-}5=&wCSARft+vuK7RqQ7cV4a
zF(_OWl=t;rLSA;inrs|PT4tijuykvZVH;;c0sktvx#F(Kkz=EpYH2IQG5*F?!|J#!
z7PB(`QwXffRO%!gW~e0Dd_L#OPMM=tn?A0^JNtFZi$*j_2s0EJnx!OkLyL{7eU_p*
z6P1jDjAk5V5QoiVF9QqPT`e+NSCSDs(I%sPB@y+Z0VichIK@z3+O}4ke{!uC!r`#Z
z*<RLdw|2<rv|FWwY3ZiX>!t1vyU;D8XH9|TG{EVI$~e2G5VZ?Y9(9+>o*^@)+A0j2
zZ4>gAO<-_mc47$eOXMP1;aRbQ&k3)*edw2Pg<%t4CvM7@p<{r-o3zx}V5dH%(c&#0
z3~^m7au3TG!6=^<OAcBXmoUbVGoX&E%9y1ODIKa2Hxn|hVuAz=ZNh3EGF6K~C@pIi
z>)XEn@L?L)C0ygb#A4wFQrzciFPz3L88f)e;L(#E8hK&Qj7qr6M_ju-cW~b}^Z|eE
zYV}NGR>mXD@xQM9e8z1tk^gb41$hvW3m-Nh4*?WmBPx-PIu!B|X-ldK3|aK0Wr=U?
zh$@P1$^pfwrWnXnQG;4~vfns>gH&fYgnEiz%Dp6Y7u`ckXo!>t7jT5GV{{#__=pqx
z#R8Ger_<<i4rkKnbq<j<&ZP>(caEw(H{hsjBf=7F#defo2mJv%9gcmO39B3-oW})+
zGlYw{<WPnjHi7z!q2e;_%@9L;nR1?t5@||pd1L{a7*9hBR;2uc{)FH70CN#ZzcJvS
zylgCDig<6%BR9B&JCPtQac>b1d&+H6!Eq=<8l=4yV%<Zel|)(PknYM%StYGqc8n%F
Z%(mOLc#J2c^)%O!WYxs@jE-4&{vY)R(HsB(

delta 459
zcmXYsOHWf#6h_zSEj_p74$4)l0wECtp-^Z7iC8Gs7v-&ZL9x8_LJPL^G2m*96UUCv
z2xd-AOw>S4G-0mMkw1igVBAzD``gLR`PMq8@#9$R=ihH9z%W%!NRcwWmHM1rw#-Q6
zAUZ)-b4$@_K1MpPINaurBDx>=+j~o;H${b-vAJiWx+5~>FwKnV*WD9yENJExv9kZl
zPrVFEm6Ye#3iYbP10G62t@t{~RqB4Au=*0YaCZLJ?^ZmPHB085?y?^9#C*^T?H*4Z
z@~kTC(!N)$)`K(Vs%G7^*+cdkn+}?1X3CzmJ$#2Pw#|V(W`0-+^S-6m{ILTSGSgB2
ztxK2~tz6^+m*^nQ2$vb>Dx>m!2PHGZP12HzF}aAS?1usfOQr|%M`Xf<V=~D>_pW>2
zo%}+s!K^!3b{Ds54IU+rSUIFE`JJ_Va_}n~4W6$Ie3Hi&n>Qrlw8-odi)(aqodi8X
n?`s<L|EHWA2#*5Ard669b_tz1@Pd+*m7A4nRL*;{hN%1lfYDT4

diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java
index 1c9a7364..6b3843ba 100644
--- a/src/main/java/com/kitsu/medievalcraft/Main.java
+++ b/src/main/java/com/kitsu/medievalcraft/Main.java
@@ -7,6 +7,7 @@ import com.kitsu.medievalcraft.crafting.ModCrafting;
 import com.kitsu.medievalcraft.entity.EntityITSpear;
 import com.kitsu.medievalcraft.entity.EntityModelArrow;
 import com.kitsu.medievalcraft.entity.EntityShit;
+import com.kitsu.medievalcraft.entity.EntityShortLivedShit;
 import com.kitsu.medievalcraft.entity.EntityTester;
 import com.kitsu.medievalcraft.events.BucketHandle;
 import com.kitsu.medievalcraft.events.EventHandle;
@@ -109,10 +110,11 @@ public class Main {
 		BucketHandle.INSTANCE.buckets.put(ModBlocks.blockTannin, ModItems.tanninBucket);
 		BucketHandle.INSTANCE.buckets.put(ModBlocks.blockSlackedLime, ModItems.slackBucket);
 		
-		EntityRegistry.registerModEntity(EntityShit.class, "itemShit", 1, this, 64, 10, true);
+		//EntityRegistry.registerModEntity(EntityShit.class, "itemShit", 1, this, 64, 10, true);
 		EntityRegistry.registerModEntity(EntityModelArrow.class, "itemModelArrow", 2, this, 64, 10, true);
 		EntityRegistry.registerModEntity(EntityITSpear.class, "itemITSpear", 3, this, 64, 10, true);
 		EntityRegistry.registerModEntity(EntityTester.class, "itemTester", 4, this, 64, 10, true);
+		EntityRegistry.registerModEntity(EntityShortLivedShit.class, "itemShit", 5, this, 64, 10, true);
 
 		GameRegistry.registerFuelHandler(new FuelHandler());
 
diff --git a/src/main/java/com/kitsu/medievalcraft/entity/EntityShortLivedShit.java b/src/main/java/com/kitsu/medievalcraft/entity/EntityShortLivedShit.java
new file mode 100644
index 00000000..e1a0bd1d
--- /dev/null
+++ b/src/main/java/com/kitsu/medievalcraft/entity/EntityShortLivedShit.java
@@ -0,0 +1,25 @@
+package com.kitsu.medievalcraft.entity;
+
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class EntityShortLivedShit extends EntityItem {
+
+    public EntityShortLivedShit(World p_i1709_1_, double p_i1709_2_, double p_i1709_4_, double p_i1709_6_)
+    {
+        super(p_i1709_1_);
+    }
+	
+	public EntityShortLivedShit(World world, double x, double y, double z,ItemStack stack) {
+		super(world, x, y, z, stack);
+		this.lifespan = 500;
+	}
+	
+	 public EntityShortLivedShit(World world)
+	    {
+	        super(world);
+	    }
+	
+
+}
diff --git a/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java b/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java
index 01534995..0df89902 100644
--- a/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java
+++ b/src/main/java/com/kitsu/medievalcraft/events/EventHandle.java
@@ -18,6 +18,7 @@ import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeDictionary.Type;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+import net.minecraftforge.event.entity.item.ItemEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -442,6 +443,21 @@ public void splitLogEvent(PlayerInteractEvent event){
 			}
 		}
 	}
+	
+	/*@SubscribeEvent
+	public void onItemShitJoinEvent(ItemEvent event){
+		
+		if(!event.entity.worldObj.isRemote){
+
+			if(event.entity.getgetEntityItem().getItem() == ModItems.itemShit){
+				//System.out.println(event.entityItem.worldObj.getBlock((int)event.entityItem.posX, (int)event.entityItem.posY-2, (int)event.entityItem.posZ));
+				/*if(event.entityItem.worldObj.getBlock((int)event.entityItem.posX, (int)event.entityItem.posY-1, (int)event.entityItem.posZ)==Blocks.grass){
+					event.entityItem.setDead();
+				}
+				event.lifespan=200;
+			}
+		}
+	}*/
 
 	@SubscribeEvent
 	public void onLivingUpdateEventShit(LivingUpdateEvent event) {
@@ -454,6 +470,7 @@ public void splitLogEvent(PlayerInteractEvent event){
 			if ( rand.nextInt(1500) == 0 ) {
 				//Checks to see if the LivingUpdate is being applied to cow, if so:
 				if (event.entity instanceof EntityCow) {
+					
 					event.entityLiving.dropItem(ModItems.itemShit, 1);
 				}
 			}
diff --git a/src/main/java/com/kitsu/medievalcraft/item/throwable/ItemShit.java b/src/main/java/com/kitsu/medievalcraft/item/throwable/ItemShit.java
index 60893473..0457e74b 100644
--- a/src/main/java/com/kitsu/medievalcraft/item/throwable/ItemShit.java
+++ b/src/main/java/com/kitsu/medievalcraft/item/throwable/ItemShit.java
@@ -1,16 +1,17 @@
 package com.kitsu.medievalcraft.item.throwable;
 
+import com.kitsu.medievalcraft.Main;
+import com.kitsu.medievalcraft.entity.EntityShit;
+import com.kitsu.medievalcraft.entity.EntityShortLivedShit;
+import com.kitsu.medievalcraft.util.CustomTab;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import com.kitsu.medievalcraft.Main;
-import com.kitsu.medievalcraft.entity.EntityShit;
-import com.kitsu.medievalcraft.util.CustomTab;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
 public class ItemShit extends Item {
 	
 	private String name = "itemShit";
@@ -24,7 +25,20 @@ public class ItemShit extends Item {
 		
 	}
 	
-	   public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
+	@Override
+	public boolean hasCustomEntity(ItemStack stack){
+		return true;		
+	}
+	public Entity createEntity(World world, Entity location, ItemStack stack){
+		EntityShortLivedShit entity = new EntityShortLivedShit(world, location.posX, location.posY, location.posZ, stack);
+		entity.motionX = location.motionX;
+		entity.motionY = location.motionY;
+		entity.motionZ = location.motionZ;
+		
+		return entity;		
+	}
+	
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
 	    {
 
 	            --stack.stackSize;