From 3de8fa21fb13d9f1079a234099389f905968567b Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Sun, 27 Oct 2013 16:03:05 -0400
Subject: [PATCH] Made hives look nicer

---
 .../biomesoplenty/worldgen/WorldGenHive.java  |  41 +++++++++++++++---
 .../biomesoplenty/textures/blocks/flesh.png   | Bin 888 -> 890 bytes
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/common/biomesoplenty/worldgen/WorldGenHive.java b/common/biomesoplenty/worldgen/WorldGenHive.java
index 2da35f36a..321938ea6 100644
--- a/common/biomesoplenty/worldgen/WorldGenHive.java
+++ b/common/biomesoplenty/worldgen/WorldGenHive.java
@@ -15,19 +15,19 @@ public class WorldGenHive extends WorldGenerator
 	@Override
 	public boolean generate(World var1, Random var2, int var3, int var4, int var5)
 	{ 
-		if (var1.getBlockId(var3, var4, var5) != Block.netherrack.blockID)
+		if (var1.getBlockId(var3, var4 + 9, var5) != Block.netherrack.blockID)
 			{
-			if (!var1.isAirBlock(var3, var4 - 1, var5))
+			if (!var1.isAirBlock(var3, var4 + 8, var5))
 				{
 					return false;
 				}
 			}
 		
         int x = var3;
-        int y = var4 + 6;
+        int y = var4 + 9;
         int z = var5;
         
-	    int baseWidth = 3 + var1.rand.nextInt(2);
+	    int baseWidth = 4 + var1.rand.nextInt(2);
 	    int baseHeight = 8 + var1.rand.nextInt(2);
 	    
 	    for (int cubeno = 0; cubeno < 3; cubeno++)
@@ -37,7 +37,7 @@ public class WorldGenHive extends WorldGenerator
 	        switch (cubeno)
 	        {
 	            case 0:
-	                chance = 0.5F;
+	                chance = 0.25F;
 	                break;
 	                
 	            case 1:
@@ -45,11 +45,25 @@ public class WorldGenHive extends WorldGenerator
 	                break;
 	                
 	            case 2:
-	                chance = 0.5F;
+	                chance = 0.75F;
 	                break;
 	        }
 	        
+	        
+	        //Top
+	        generateHiveCubeSmall(var1, x, (y + 2) + cubeno, z, (baseHeight - 8) + (cubeno * 2), (baseWidth - 1) + cubeno, cubeno, chance);
+	        
+	        //Middle
 	        generateHiveCube(var1, x, y + cubeno, z, baseHeight + (cubeno * 2), baseWidth + cubeno, cubeno, chance);
+	        
+	        //Bottom
+	        generateHiveCubeSmall(var1, x, (y - (baseHeight + 2)) + cubeno, z, (baseHeight - 8) + (cubeno * 2), (baseWidth - 1) + cubeno, cubeno, chance);
+	        
+	        //Bottom 2
+	        generateHiveCubeSmall(var1, x, (y - (baseHeight + 3)) + cubeno, z, (baseHeight - 7) + (cubeno * 2), (baseWidth - 2) + cubeno, cubeno, chance);
+	        
+	        //Bottom 3
+	        generateHiveCubeSmall(var1, x, (y - (baseHeight + 5)) + cubeno, z, (baseHeight - 7) + (cubeno * 2), (baseWidth - 4) + cubeno, cubeno, chance);
 	    }
 	    
 	    return true;
@@ -71,4 +85,19 @@ public class WorldGenHive extends WorldGenerator
             }
         }
 	}
+	
+	public void generateHiveCubeSmall(World world, int origx, int origy, int origz, int height, int width, int cubeno, float chance)
+	{
+        for (int hLayer = 0; hLayer < height; hLayer++)
+        {     
+            for (int i = -width; i < width; i++)
+            {
+                for (int j = -width; j < width; j++)
+                {
+                    if ((hLayer == 0 || hLayer == (height - 1)) && (world.rand.nextFloat() <= chance)) world.setBlock(origx + i, origy - hLayer, origz + j, Blocks.hive.get().blockID); 
+                    else if ((i == -width || i == (width - 1) || j == -width || j == (width - 1)) && (world.rand.nextFloat() <= chance)) world.setBlock(origx + i, origy - hLayer, origz + j, Blocks.hive.get().blockID);
+                }
+            }
+        }
+	}
 }
diff --git a/resources/assets/biomesoplenty/textures/blocks/flesh.png b/resources/assets/biomesoplenty/textures/blocks/flesh.png
index 1e73f9cd1ec72fcbfbef7176953e70ab7dc056a5..2a766fd1c4a98804e6437ba2dd077328be8bb992 100644
GIT binary patch
delta 806
zcmV+>1KIre2Kok&JPN=701m(bYSxJfkwz(h_DMuRR5(u!&|OaxSpb0H`6tGp!Z1D4
zGv9OO%sDgD>5Ofaf>4PH#tVTMBm3#a-l&1iLMy0^Kq0NQtpmacDo~7sxGRkkscs}o
zcHMYo)Jy+_{DJpLUglX>`qkNvvL@9%dlqo(2{$jWPaLa^q-RMdbm&Ul-ZE$%I|~$l
zuepesj=}{KKaSy|Ancw<%s}=*GPUf|EzhgyF!cP2AqKWqqsl{y>ZueHBHT<TN&@)H
zjc=&R`|fmz^!4N3pI-7N7pZ8ZhU9=MlM*aN#ge8lHLQK=$ux*Hp~@eUC-(a~UK~$V
ziJAj^&9{q!{Kj*~SoZDE<y<=qvBoTacw`Z&V-oxK@Nn+H@yTeEuRCPja~@(;R>l3U
z)BksOPU+I?xHTUI%$keK2yLgmtN?aAf8<zX@9J+kiT^x!e!7)k#^$PH{J~32H}UQK
znVKmvw?SmXwpLAR({@K7*ZlSBLhq@)i-Y65@UAN{r|4q}XbxXFNNiE{ksW7$s)oLu
zpsTK3ROM~o8<pAj1B2rVw;?K1NUo&(6;m6B;_ik1Ne#?ng$XUAO10`qZ`sr*j)0wH
zDlbbrG3!Z!mTj?MnVY`<+>hrCv}Eb`1&(=ssw0SLGqN}<3x#&6qJn~|l;r3w4it$p
z#tVT<Klb&7t~bSjnnsx-;O=XGk^lO8Yr6iiyLVkj(~zqmWz#16XEUn~x!uNAEs||(
znTdb^>j#(YhV6Xq&E%o6f2QZ2C|)~s_z^Z5)P3p3<|w|=(w2qnbrBRLZV8)AAj<#t
zbl+9ryP->yBERUFrFc9ia9c@#N{$p&H8knZEr%PIhqHWJKnU|D9{at2wdL)({?Q}H
zK6G_7lK!kJ--@y$tw-|^G%|_N_ST&retB@ZbNAxFb-*zd13op$G}fD)$pDFEiJv#5
zy9TTg{Y!r)8xi+@{OOJY|G6|Y0YO2GFe?<71bz;3WdQ4$^b#f|6%~;b5`7KhK-0!m
ke%G-Jwz5dbMyB&Swp$_*m(Y$yXaE2J07*qoM6N<$f;K#s6951J

delta 804
zcmV+<1Ka%i2KWY$JPN@801m+cxRGn^kwz(h^hrcPR5(u!&|6R2Rsg_pf0L=AD;VcE
z$M?(eIkw~2P0|q<WT+K%d)m{6+Nsa&M5f#tU=f6XoTiCqD7df=2vrf<g=|A5+O(?a
zWvaGm>h`!VF}}e6C;h3%6WO1xjkOe^>so7oIY>D*j(%jDElqfwwj-PDCaq(gbdkM(
zNzlHdQS~_7G|<-x<a6BFmDDPvze;Cz9CGZsZ52kY*Vg&aQUW49AX+z*p&||Sv#BNr
zzIT#`vh>?zHqz9C%kFn>`Ysb|D>%@^kVp#xY{vPfB2fWS{+`P9uvwMG*Xb*RnXzv#
zXF6D}05<R}pA(<DPLZYu)uqZPjF3WqZMt|%lZyiV>)c%B-0^Te&US5l;Mxz6){^<b
z#0S4mj<2Y~&q;G54yb(xwKVM{>y|li>U#5+Vt;OKR|NL$$Jgt_><%*aY`wq=eJAzb
z^{as)P)i_oXqkJ4d1N{Bka->ki*q0TRVb8L?w5(wx}+8*(4YJCJaJ6qhgOn*>gei8
zitIU-FN-Ihn-}RniiMKI9P-kNCbl!)uA!75fA-Prf&w;>L`A0FAxh^xcgIkx7r|*d
zQxk>Lg!w2%S{C0hjU&%{;w5Xkwr#5SIfi=j{#ck$Rz-eI<Qk(wTLukTYKrki2KZPi
zvRvqpH#0Ml<E}6uPzdD%=Dretdo?>9sOp=^=>t`(L#C}sM;0Dj%k9~CX@u^WxI8kn
z8UrCx&o5a$%l>ydSA+WC>eM}+zx~dIhe+=c=LaXTPSEE=BV|b6;ejtO+sL3oUVJ$<
zxh%m~)w>HkyX6|qWU|6B$7ydxjQO%08RWB}3qLN`%j`&qG4(W=_+of}=*6vD`HPoc
zPmJ}_-kK~f#_9RtcWV&za;g02aNoaI`ef!=A%6!jR9lDN7`Tqq{&+gn_?EzK=)$rN
z1FZftn=8loXE$zsDZ#f(#VQ01K1S^l)a2N8$g}|L=Ca!eH)YM&gb1tq2!)DLlG!uc
iYFN@1#)rA_{{a{&CO$zAWmTsD0000<MNUMnLSTYyE}7~8