Allow Blocks and Entities to return multiple Entities

Lecterns are no longer poseable
Lecterns now return both the lectern and its book.

Author: NotStirred

chunky/src/java/se/llbit/chunky/block/Block.java

@@ -13,7 +13,7 @@
 import se.llbit.nbt.CompoundTag;
 import se.llbit.nbt.Tag;
 
-import java.util.List;
+import java.util.Collection;
 import java.util.Random;
 
 public abstract class Block extends Material {
@@ -119,7 +119,7 @@ public boolean isBlockWithEntity() {
     return false;
   }
 
-  public Entity toEntity(Vector3 position) {
+  public Collection<Entity> toEntity(Vector3 position) {
     throw new Error("This block type can not be converted to an entity: "
         + getClass().getSimpleName());
   }

chunky/src/java/se/llbit/chunky/block/CakeWithCandle.java

@@ -6,6 +6,8 @@
 import se.llbit.chunky.resources.Texture;
 import se.llbit.math.Vector3;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Random;
 
 public class CakeWithCandle extends AbstractModelBlock {
@@ -42,8 +44,8 @@ public boolean isBlockWithEntity() {
   }
 
   @Override
-  public Entity toEntity(Vector3 position) {
-    return new FlameParticles(position, entity);
+  public Collection<Entity> toEntity(Vector3 position) {
+    return Collections.singletonList(new FlameParticles(position, entity));
   }
 
   @Override

chunky/src/java/se/llbit/chunky/block/Candle.java

@@ -8,6 +8,8 @@
 import se.llbit.chunky.world.material.TextureMaterial;
 import se.llbit.math.Vector3;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Random;
 
 public class Candle extends AbstractModelBlock {
@@ -70,11 +72,11 @@ public boolean isBlockWithEntity() {
   }
 
   @Override
-  public Entity toEntity(Vector3 position) {
+  public Collection<Entity> toEntity(Vector3 position) {
     if (entity != null) {
-      return new FlameParticles(position, entity);
+      return Collections.singletonList(new FlameParticles(position, entity));
     } else {
-      return new FlameParticles(position, this, new Vector3[0]);
+      return Collections.singletonList(new FlameParticles(position, this, new Vector3[0]));
     }
   }
 

chunky/src/java/se/llbit/chunky/block/CoralFan.java

@@ -4,10 +4,11 @@
 import se.llbit.chunky.entity.Entity;
 import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.chunky.resources.Texture;
-import se.llbit.math.Quad;
 import se.llbit.math.Ray;
 import se.llbit.math.Vector3;
-import se.llbit.math.Vector4;
+
+import java.util.Collection;
+import java.util.Collections;
 
 public class CoralFan extends MinecraftBlockTranslucent {
 
@@ -55,7 +56,7 @@ public static Texture coralTexture(String coralType) {
     return true;
   }
 
-  @Override public Entity toEntity(Vector3 position) {
-    return new CoralFanEntity(position, coralType);
+  @Override public Collection<Entity> toEntity(Vector3 position) {
+    return Collections.singletonList(new CoralFanEntity(position, coralType));
   }
 }

chunky/src/java/se/llbit/chunky/block/EnchantingTable.java

@@ -2,11 +2,13 @@
 
 import se.llbit.chunky.entity.Book;
 import se.llbit.chunky.entity.Entity;
-import se.llbit.chunky.model.BlockModel;
 import se.llbit.chunky.model.EnchantmentTableModel;
 import se.llbit.chunky.resources.Texture;
 import se.llbit.math.Vector3;
 
+import java.util.Collection;
+import java.util.Collections;
+
 public class EnchantingTable extends AbstractModelBlock {
 
   public EnchantingTable() {
@@ -27,7 +29,7 @@ public boolean isBlockWithEntity() {
   }
 
   @Override
-  public Entity toEntity(Vector3 position) {
+  public Collection<Entity> toEntity(Vector3 position) {
     Vector3 newPosition = new Vector3(position);
     newPosition.add(0, 0.35, 0);
     Book book = new Book(
@@ -37,6 +39,6 @@ public Entity toEntity(Vector3 position) {
         Math.toRadians(180 - 30));
     book.setPitch(Math.toRadians(80));
     book.setYaw(Math.toRadians(45));
-    return book;
+    return Collections.singletonList(book);
   }
 }

chunky/src/java/se/llbit/chunky/block/Head.java

@@ -29,6 +29,9 @@
 import se.llbit.nbt.Tag;
 import se.llbit.util.mojangapi.MinecraftSkin;
 
+import java.util.Collection;
+import java.util.Collections;
+
 public class Head extends MinecraftBlockTranslucent {
 
   private final String description;
@@ -60,8 +63,8 @@ public boolean isEntity() {
   }
 
   @Override
-  public Entity toEntity(Vector3 position) {
-    return new SkullEntity(position, type, rotation, 1);
+  public Collection<Entity> toEntity(Vector3 position) {
+    return Collections.singletonList(new SkullEntity(position, type, rotation, 1));
   }
 
   @Override

chunky/src/java/se/llbit/chunky/block/Lectern.java

@@ -6,6 +6,8 @@
 import se.llbit.math.Ray;
 import se.llbit.math.Vector3;
 
+import java.util.Collection;
+
 public class Lectern extends MinecraftBlockTranslucent {
     private final String facing;
     private final boolean hasBook;
@@ -30,7 +32,7 @@ public boolean isEntity() {
     }
 
     @Override
-    public Entity toEntity(Vector3 position) {
-        return new se.llbit.chunky.entity.Lectern(position, this.facing, this.hasBook);
+    public Collection<Entity> toEntity(Vector3 position) {
+      return se.llbit.chunky.entity.Lectern.create(position, this.facing, this.hasBook);
     }
 }

chunky/src/java/se/llbit/chunky/block/LilyPad.java

@@ -9,6 +9,9 @@
 import se.llbit.math.Vector3;
 import se.llbit.nbt.CompoundTag;
 
+import java.util.Collection;
+import java.util.Collections;
+
 public class LilyPad extends MinecraftBlockTranslucent {
   public LilyPad() {
     super("lily_pad", Texture.lilyPad);
@@ -25,7 +28,7 @@ public LilyPad() {
     return true;
   }
 
-  @Override public Entity toEntity(Vector3 position) {
-    return new LilyPadEntity(position);
+  @Override public Collection<Entity> toEntity(Vector3 position) {
+    return Collections.singletonList(new LilyPadEntity(position));
   }
 }

chunky/src/java/se/llbit/chunky/block/SporeBlossom.java

@@ -6,6 +6,9 @@
 import se.llbit.math.Ray;
 import se.llbit.math.Vector3;
 
+import java.util.Collection;
+import java.util.Collections;
+
 public class SporeBlossom extends Block {
 
   public SporeBlossom() {
@@ -26,7 +29,7 @@ public boolean isEntity() {
   }
 
   @Override
-  public Entity toEntity(Vector3 position) {
-    return new se.llbit.chunky.entity.SporeBlossom(position);
+  public Collection<Entity> toEntity(Vector3 position) {
+    return Collections.singletonList(new se.llbit.chunky.entity.SporeBlossom(position));
   }
 }

chunky/src/java/se/llbit/chunky/block/WallCoralFan.java

@@ -7,6 +7,9 @@
 import se.llbit.math.Ray;
 import se.llbit.math.Vector3;
 
+import java.util.Collection;
+import java.util.Collections;
+
 public class WallCoralFan extends MinecraftBlockTranslucent {
 
   private final String coralType;
@@ -29,7 +32,7 @@ public WallCoralFan(String name, String coralType, String facing) {
     return true;
   }
 
-  @Override public Entity toEntity(Vector3 position) {
-    return new WallCoralFanEntity(position, coralType, facing);
+  @Override public Collection<Entity> toEntity(Vector3 position) {
+    return Collections.singletonList(new WallCoralFanEntity(position, coralType, facing));
   }
 }