DynamicRenderer for BWBlock with TileEntity

Author: ExE-Boss

minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/backward/BWBlock.java

@@ -21,6 +21,7 @@
 package nova.core.wrapper.mc.forge.v17.wrapper.block.backward;
 
 import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -32,6 +33,7 @@
 import nova.core.block.component.BlockProperty;
 import nova.core.block.component.LightEmitter;
 import nova.core.component.misc.Collider;
+import nova.core.component.renderer.DynamicRenderer;
 import nova.core.component.renderer.StaticRenderer;
 import nova.core.component.transform.BlockTransform;
 import nova.core.item.ItemFactory;
@@ -98,8 +100,22 @@ public BWBlock(net.minecraft.block.Block block, World world, Vector3D pos) {
 					.collect(Collectors.toSet());
 			});
 		//TODO: Set selection bounds
-		components.add(new StaticRenderer()).onRender(model ->
-			model.addChild(new CustomModel(self -> RenderBlocks.getInstance().renderBlockByRenderType(mcBlock, x(), y(), z()))));
+		components.add(new StaticRenderer())
+			.onRender(model -> {
+				model.addChild(new CustomModel(self -> {
+					RenderBlocks.getInstance()
+						.renderBlockByRenderType(mcBlock, x(), y(), z());
+				}));
+			});
+		getTileEntity().ifPresent(tileEntity -> {
+			components.add(new DynamicRenderer())
+				.onRender(model -> {
+					model.addChild(new CustomModel(self -> {
+						TileEntityRendererDispatcher.instance.renderTileEntityAt(tileEntity, position().getX(), position().getY(), position().getZ(), 0);
+					}));
+				});
+			});
+
 		WrapperEvent.BWBlockCreate event = new WrapperEvent.BWBlockCreate(world, pos, this, mcBlock);
 		Game.events().publish(event);
 	}

minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/BWItem.java

@@ -67,7 +67,7 @@ public BWItem(net.minecraft.item.Item item, int meta, NBTTagCompound tag) {
 					buffer.put(flatArray);
 					buffer.position(0);
 					GL11.glMultMatrix(buffer);
-						RenderItem.getInstance().doRender(fakeEntity, 0, 0, 0, 0, 0);
+					RenderItem.getInstance().doRender(fakeEntity, 0, 0, 0, 0, 0);
 					GL11.glPopMatrix();
 					Tessellator.instance.startDrawingQuads();
 				}));

minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/backward/BWBlock.java

@@ -24,6 +24,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -36,6 +37,7 @@
 import nova.core.block.component.BlockProperty;
 import nova.core.block.component.LightEmitter;
 import nova.core.component.misc.Collider;
+import nova.core.component.renderer.DynamicRenderer;
 import nova.core.component.renderer.StaticRenderer;
 import nova.core.component.transform.BlockTransform;
 import nova.core.item.ItemFactory;
@@ -102,9 +104,22 @@ public BWBlock(net.minecraft.block.Block block, World world, Vector3D pos) {
 					.collect(Collectors.toSet());
 			});
 		//TODO: Set selection bounds
-		components.add(new StaticRenderer()).onRender(model ->
-			model.addChild(new CustomModel(self -> Minecraft.getMinecraft().getBlockRendererDispatcher()
-				.renderBlock(blockState(), new BlockPos(x(), y(), z()), getMcBlockAccess(), Tessellator.getInstance().getWorldRenderer()))));
+		components.add(new StaticRenderer())
+			.onRender(model -> {
+				model.addChild(new CustomModel(self -> {
+					Minecraft.getMinecraft().getBlockRendererDispatcher()
+						.renderBlock(blockState(), new BlockPos(x(), y(), z()), getMcBlockAccess(), Tessellator.getInstance().getWorldRenderer());
+				}));
+			});
+		getTileEntity().ifPresent(tileEntity -> {
+			components.add(new DynamicRenderer())
+				.onRender(model -> {
+					model.addChild(new CustomModel(self -> {
+						TileEntityRendererDispatcher.instance.renderTileEntityAt(tileEntity, position().getX(), position().getY(), position().getZ(), 0);
+					}));
+				});
+			});
+		
 		WrapperEvent.BWBlockCreate event = new WrapperEvent.BWBlockCreate(world, pos, this, mcBlock);
 		Game.events().publish(event);
 	}

minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/BWItem.java

@@ -20,13 +20,19 @@
 
 package nova.core.wrapper.mc.forge.v18.wrapper.item;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import nova.core.component.renderer.StaticRenderer;
 import nova.core.item.Item;
 import nova.core.render.model.CustomModel;
 import nova.core.retention.Storable;
-import nova.core.wrapper.mc.forge.v18.wrapper.render.BWClientRenderManager;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.opengl.GL11;
+
+import java.nio.DoubleBuffer;
+import java.util.Arrays;
 
 /**
  * @author Stan
@@ -46,8 +52,23 @@ public BWItem(net.minecraft.item.Item item, int meta, NBTTagCompound tag) {
 		this.meta = meta;
 		this.tag = tag;
 
-		components.add(new StaticRenderer()).onRender(model ->
-			model.addChild(new CustomModel(self -> BWClientRenderManager.renderItem().renderItemModel(makeItemStack(count())))));
+		components.add(new StaticRenderer())
+			.onRender(model -> {
+				model.addChild(new CustomModel(self -> {
+					Tessellator.getInstance().draw();
+					GL11.glPushMatrix();
+					DoubleBuffer buffer = BufferUtils.createDoubleBuffer(4 * 4);
+					double[] flatArray = Arrays.stream(self.matrix.getMatrix().getData())
+						.flatMapToDouble(Arrays::stream)
+						.toArray();
+					buffer.put(flatArray);
+					buffer.position(0);
+					GL11.glMultMatrix(buffer);
+					Minecraft.getMinecraft().getRenderItem().renderItemModel(makeItemStack(count()));
+					GL11.glPopMatrix();
+					Tessellator.getInstance().getWorldRenderer().startDrawingQuads();
+				}));
+			});
 	}
 
 	public net.minecraft.item.Item getItem() {