From 0816149d89cc0f0405600a5ae7df49908b0cd540 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Fri, 17 May 2013 05:59:08 -0400
Subject: [PATCH] Finished up the Glob entity.

---
 .../biomesoplenty/biomes/BiomeGenBog.java       |   1 -
 .../biomesoplenty/biomes/BiomeGenDeadSwamp.java |   1 -
 .../biomesoplenty/biomes/BiomeGenQuagmire.java  |   1 -
 .../configuration/BOPEntities.java              |   7 ++++++-
 .../biomesoplenty/mobs/EntityGlob.java          |   2 +-
 .../mods/BiomesOPlenty/textures/mobs/glob.png   | Bin 594 -> 586 bytes
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBog.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBog.java
index fedbdf42c..8d73ce61a 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeGenBog.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBog.java
@@ -38,7 +38,6 @@ public class BiomeGenBog extends BiomeGenBase
         this.customBiomeDecorator.mudPerChunk2 = 5;
         this.customBiomeDecorator.deadBushPerChunk = 5;
 		this.customBiomeDecorator.algaePerChunk = 2;
-        this.spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
         this.waterColorMultiplier = 11506176;
     }
 
diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java
index 769f923d5..546f1c5c8 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java
@@ -37,7 +37,6 @@ public class BiomeGenDeadSwamp extends BiomeGenBase
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
 		this.waterColorMultiplier = 10661201;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
     }
 
     /**
diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java
index 929d0864d..9d293d3e4 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java
@@ -31,7 +31,6 @@ public class BiomeGenQuagmire extends BiomeGenBase
         this.customBiomeDecorator.sandPerChunk2 = -999;
         this.waterColorMultiplier = 13390080;
 		this.customBiomeDecorator.generateQuagmire = true;
-		this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
     }
 	
     /**
diff --git a/src/minecraft/biomesoplenty/configuration/BOPEntities.java b/src/minecraft/biomesoplenty/configuration/BOPEntities.java
index cc1ade70c..bbee93dea 100644
--- a/src/minecraft/biomesoplenty/configuration/BOPEntities.java
+++ b/src/minecraft/biomesoplenty/configuration/BOPEntities.java
@@ -51,12 +51,17 @@ public class BOPEntities {
 		
 		registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646);
 		registerEntityEgg(EntityRosester.class, 14831439, 16756224);
-		registerEntityEgg(EntityGlob.class, 14831439, 16756224);
+		registerEntityEgg(EntityGlob.class, 6836276, 8414787);
 		
 		if (Biomes.jungleNew.isPresent() && Biomes.tropicalRainforest.isPresent() && Biomes.oasis.isPresent() && Biomes.tropics.isPresent())
 		{
 			EntityRegistry.addSpawn(EntityJungleSpider.class, 8, 1, 3, EnumCreatureType.monster, Biomes.jungleNew.get(), Biomes.tropicalRainforest.get(), Biomes.oasis.get(), Biomes.tropics.get());
 		}
+		
+		if (Biomes.bog.isPresent() && Biomes.deadSwamp.isPresent() && Biomes.fen.isPresent() && Biomes.moor.isPresent() && Biomes.quagmire.isPresent() && Biomes.swamplandNew.isPresent())
+		{
+			EntityRegistry.addSpawn(EntityJungleSpider.class, 1, 1, 1, EnumCreatureType.creature, Biomes.bog.get(), Biomes.deadSwamp.get(), Biomes.fen.get(), Biomes.moor.get(), Biomes.quagmire.get(), Biomes.swamplandNew.get());
+		}
 
 		if (Biomes.garden.isPresent())
 		{
diff --git a/src/minecraft/biomesoplenty/mobs/EntityGlob.java b/src/minecraft/biomesoplenty/mobs/EntityGlob.java
index d1c3a9fe2..4bffdeb80 100644
--- a/src/minecraft/biomesoplenty/mobs/EntityGlob.java
+++ b/src/minecraft/biomesoplenty/mobs/EntityGlob.java
@@ -276,7 +276,7 @@ public class EntityGlob extends EntityLiving implements IMob
      */
     protected int getDropItemId()
     {
-        return this.getGlobSize() == 1 ? Items.mudball.get().itemID : 0;
+        return this.getGlobSize() == 1 ? Item.slimeBall.itemID : Items.mudball.get().itemID;
     }
 
     /**
diff --git a/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png b/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png
index 4223e8376d60d3d727f308ff65afaa40dea84b28..ea73d4c026ddf4fc1ced856626c95f36c6f5b3db 100644
GIT binary patch
delta 499
zcmV<P0Sx}q1j+=EJPN=701m(bYSxJfkwz(h#z{m$RA@u(l(9+#K@dbYH1-4h1`$o=
zKrj$F1W}AcJP|Q8F)_Hm6TfPumM*DlyZ2adnRRap9y2#RJ5$w+Hrup*KKlZ%*C(IR
zT#450m{e`s_EKC7ro3DocjL$7Vk128b2}zg6j~{+r~#|x(a$`pD|Sq(D6~>sQ9!<b
z0HAfOqdBb4<^}j*8GIQWXVU;5OzC?8z>Y~3g;t6ydja^3nl>Q9j!6}TR*FkQYFMsE
zXx)xU6@^wtS7tn7Tb)Er%D#<4E2B%zWG1<;^=NNa@7o)NRz{ba;orHg=^UfZht_$v
z-eWe(iKbzSBTdsd=Rp4vqUP%g>pYWxcL1)v?H}x!l`^6s1cNCJ=wXc`18QB*@O9q+
zjAo;pXeh!50KP#{K#tM3r~#g1Hp<DHBn+R`f#0JqKx=GB^sU(_CmK;xI#;;<et-I_
z)<<?8FdNg;a&g!W!9JUh5bELPd;^Aky1VRtbDV7hqM)?_wE;WSfFamt|4&g~n7_oX
znXX`R$WsTHE4p97nq4zp!Q|@pq6@;2fi$FFXHyt7TeoYbE0|Q%7#S#A$6V3<3fAnJ
p=?W%y{soMQT~k$6RW(61%{PpEIF_dd1T+8u002ovPDHLkV1l8L<0}9F

delta 507
zcmV<X0R;Za1kwbMJPN@801m+cxRGn^kwz(h&PhZ;RA@u(R53~fK@i-~*a!Fq5l!Vl
zFc3KeQH(@95iv9|F}UA}uUe_4OX}M0Jr-PM-J61<XS-*5s+zfLwqgBz_65FPpL|AZ
zWt6uzDcZK}WpU7mntQoA?$#fViw(2UkgQFL$h5LJydlKZ^61B?ulcpLNfDV=7KfUD
zA^i)`JcfgaZ`7<!ipaFGIAFpX%ZNQ1XEOkAOxgDWKx>mCGOa9*>;>Q(H61`iYm*`}
ztt<{Tsb-mvsC8?TA~LNU9hvZm+v;RAr0i^DS~)sYOeT_ftw(#adf(p2v~qN)82-*R
zr)xxA53RGe-eWS#fubRbk)kP_Yf%4x2vPHOCF|_TJ3!{%_7C<<N*PcPj6swd^kj{Z
z2DPp|eBBQK(PWeZ1x54*KtG_!AY*hEHIRKwMmczqB+X}a(C^U~pfwI8I%_h@fkIT2
zu9eKc-=F@f^)c%QnvCgTxj1Zx(2mUqF!gYAzCoIOy1VSY8D~3y$Y>ov9l#D|4PXfE
z*#ARh<}Yd2OcxM2<f(&LD|NpTIlE@MfXLPDMQ4POhSa3bb0{>L<?Wj30wPs3A`NAE
xtd+W7iJV<CT|nf{zko4m*HlzgR7?;}^9^9tJE;T9LmmJC002ovPDHLkV1hUZ?V11p