Single Instance TESRs should render themselves, not nothing.

ChiselsAndBits · Aug 10, 2016 · 5b823dd · 5b823dd
1 parent 538caa5
commit 5b823dd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/TileEntityBlockChiseledTESR.java b/src/main/java/mod/chiselsandbits/chiseledblock/TileEntityBlockChiseledTESR.java
@@ -1,10 +1,12 @@
 package mod.chiselsandbits.chiseledblock;
 
+import java.util.Collections;
+import java.util.List;
+
 import mod.chiselsandbits.chiseledblock.data.VoxelBlob;
 import mod.chiselsandbits.chiseledblock.data.VoxelNeighborRenderTracker;
 import mod.chiselsandbits.core.ChiselsAndBits;
 import mod.chiselsandbits.helpers.ModUtil;
-import mod.chiselsandbits.render.chiseledblock.tesr.TileList;
 import mod.chiselsandbits.render.chiseledblock.tesr.TileRenderCache;
 import mod.chiselsandbits.render.chiseledblock.tesr.TileRenderChunk;
 import net.minecraft.util.EnumFacing;
@@ -104,10 +106,11 @@ public TileRenderCache getCache()
 			singleCache = new TileRenderCache() {
 
 				@Override
-				public TileList getTiles()
+				public List<TileEntityBlockChiseledTESR> getTileList()
 				{
-					return new TileList();
+					return Collections.singletonList( self );
 				}
+
 			};
 		}
 

diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/ChisledBlockBackgroundRender.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/ChisledBlockBackgroundRender.java
@@ -59,10 +59,10 @@ protected void finalize() throws Throwable
 	public ChisledBlockBackgroundRender(
 			final ChunkCache cache,
 			final BlockPos chunkOffset,
-			final TileList iterable,
+			final List<TileEntityBlockChiseledTESR> myList,
 			final BlockRenderLayer layer )
 	{
-		myPrivateList = iterable.createCopy();
+		myPrivateList = myList;
 		this.layer = layer;
 		this.cache = cache;
 		this.chunkOffset = chunkOffset;

diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/ChisledBlockRenderChunkTESR.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/ChisledBlockRenderChunkTESR.java
@@ -490,7 +490,7 @@ private void renderLogic(
 			{
 				// copy the tiles for the thread..
 				final ChunkCache cache = new ChunkCache( getWorld(), chunkOffset, chunkOffset.add( 16, 16, 16 ), 1 );
-				final FutureTask<Tessellator> newFuture = new FutureTask<Tessellator>( new ChisledBlockBackgroundRender( cache, chunkOffset, renderCache.getTiles(), layer ) );
+				final FutureTask<Tessellator> newFuture = new FutureTask<Tessellator>( new ChisledBlockBackgroundRender( cache, chunkOffset, renderCache.getTileList(), layer ) );
 
 				try
 				{

diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/TileRenderCache.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/TileRenderCache.java
@@ -1,6 +1,9 @@
 package mod.chiselsandbits.render.chiseledblock.tesr;
 
+import java.util.List;
+
 import mod.chiselsandbits.chiseledblock.EnumTESRRenderState;
+import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseledTESR;
 import mod.chiselsandbits.core.ClientSide;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraftforge.client.MinecraftForgeClient;
@@ -22,7 +25,7 @@ public TileLayerRenderCache getLayer(
 		return solid;
 	}
 
-	public abstract TileList getTiles();
+	abstract public List<TileEntityBlockChiseledTESR> getTileList();
 
 	public EnumTESRRenderState update(
 			final BlockRenderLayer layer,

diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/TileRenderChunk.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/tesr/TileRenderChunk.java
@@ -1,6 +1,7 @@
 package mod.chiselsandbits.render.chiseledblock.tesr;
 
 import java.util.Iterator;
+import java.util.List;
 
 import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseledTESR;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -114,6 +115,11 @@ public AxisAlignedBB getBounds()
 	}
 
 	@Override
+	public List<TileEntityBlockChiseledTESR> getTileList()
+	{
+		return tiles.createCopy();
+	}
+
 	public TileList getTiles()
 	{
 		return tiles;