Better Bee spawning

Author: duplexsystem

structures/misc/bee-nest/bee_nest.tesf

@@ -1,32 +1,33 @@
-num dir = randomInt(4);
+num randomDir = randomInt(4);
 num x = 0;
 num z = 0;
 str face = "west";
-num bees = 2 + randomInt(2);
+num randomBees = 2 + randomInt(2);
 
-if (dir == 0) {
+if (randomDir == 0) {
     face = "west";
     x = -1;
     z = 0;
-} else if (dir == 1) {
+} else if (randomDir == 1) {
     face = "north";
     x = 0;
     z = -1;
-} else if (dir == 2) {
+} else if (randomDir == 2) {
     face = "east";
     x = 1;
     z = 0;
-} else if (dir == 3) {
+} else if (randomDir == 3) {
     face = "south";
     x = 0;
     z = 1;
 }
 
+num randomBeesMinusOne = randomBees - 1;
 str bee_data = "{bees:[";
-for (num i = 0; i < bees; i = i + 1) {
+for (num i = 0; i < randomBees; i = i + 1) {
     str bee = "{entity_data:{id:\"minecraft:bee\"},min_ticks_in_hive:" + (i * 150) + ",ticks_in_hive:0}";
     bee_data = bee_data + bee;
-    if (i < bees - 1) {
+        if (i < randomBeesMinusOne) {
         bee_data = bee_data + ",";
     }
 }

structures/misc/bee-nest/bee_nest_block.tesf

@@ -1,6 +1,13 @@
 str direction = "west";
 num randomDir = randomInt(4);
 num randomHon = randomInt(6);
+num randomBees = randomInt(101);
+
+if (randomBees >= 85) {
+    randomBees = 3;
+} else {
+    randomBees = 0;
+}
 
 if (randomDir == 0) {
     direction = "west";
@@ -12,4 +19,19 @@ if (randomDir == 0) {
     direction = "north";
 } 
 
-block(0, 0, 0,"minecraft:bee_nest[facing="+ direction +",honey_level="+ randomHon +"]", true);
+str bee_data = "";
+
+if (randomBees > 0) {
+    num randomBeesMinusOne = randomBees - 1;
+    bee_data = "{bees:[";
+    for (num i = 0; i < randomBees; i = i + 1) {
+        str bee = "{entity_data:{id:\"minecraft:bee\"},min_ticks_in_hive:" + (i * 150) + ",ticks_in_hive:0}";
+        bee_data = bee_data + bee;
+        if (i < randomBeesMinusOne) {
+            bee_data = bee_data + ",";
+        }
+    }
+    bee_data = bee_data + "]}";
+}
+
+block(0, 0, 0, "minecraft:bee_nest[facing="+ direction +",honey_level="+ randomHon +"]" + bee_data, true);

structures/misc/bee-nest/large_bee_nest.tesf

@@ -38,13 +38,6 @@ for (num x = -radius-warp; x < radius+warp; x = x + 1) {
     }
 }
 
-entity(0, yTranslate + 10, 0, "minecraft:bee");
-entity(0, yTranslate + 10, 0, "minecraft:bee");
-entity(0, yTranslate + 10, 0, "minecraft:bee");
-entity(0, yTranslate + 10, 0, "minecraft:bee");
-entity(0, yTranslate + 10, 0, "minecraft:bee");
-
-
 structure(3-randomInt(7), 15, 3-randomInt(7), "honey_comb", "NONE");
 structure(3-randomInt(7), 15, 3-randomInt(7), "honey_comb", "NONE");
 structure(3-randomInt(7), 15, 3-randomInt(7), "honey_comb", "NONE");