diff --git a/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java b/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java index 0fa3e3461..240ced509 100644 --- a/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java @@ -8,7 +8,7 @@ import com.volmit.iris.object.IrisDimension; import com.volmit.iris.util.InvertedBiomeGrid; import com.volmit.iris.util.RNG; -public abstract class CeilingChunkGenerator extends LitChunkGenerator +public abstract class CeilingChunkGenerator extends PostBlockChunkGenerator { protected boolean generatingCeiling = false; protected boolean ceilingCached = false; diff --git a/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java b/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java index 4fb0e4b7f..10f01f7fc 100644 --- a/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java @@ -21,18 +21,11 @@ public abstract class DimensionChunkGenerator extends ContextualChunkGenerator protected static final BlockData AIR = Material.AIR.createBlockData(); protected static final BlockData CAVE_AIR = Material.CAVE_AIR.createBlockData(); protected static final BlockData BEDROCK = Material.BEDROCK.createBlockData(); - protected LitChunkGenerator thisLight; public DimensionChunkGenerator(String dimensionName) { super(); this.dimensionName = dimensionName; - thisLight = (LitChunkGenerator) this; - } - - protected void lit(int x, int y, int z, BlockData d) - { - thisLight.queueLight(x, y, z, d); } public IrisDimension getDimension() diff --git a/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java b/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java index 5e3b1a66f..3203ac5e2 100644 --- a/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java @@ -119,7 +119,7 @@ public class IrisChunkGenerator extends CeilingChunkGenerator implements IrisCon @Override protected void onChunkLoaded(Chunk c) { - super.onChunkLoaded(c); + } @Override diff --git a/src/main/java/com/volmit/iris/gen/LitChunkGenerator.java b/src/main/java/com/volmit/iris/gen/LitChunkGenerator.java deleted file mode 100644 index b77fa53cc..000000000 --- a/src/main/java/com/volmit/iris/gen/LitChunkGenerator.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.volmit.iris.gen; - -import org.bukkit.Chunk; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; - -import com.volmit.iris.Iris; -import com.volmit.iris.util.BlockDataTools; -import com.volmit.iris.util.BlockPosition; -import com.volmit.iris.util.KList; - -public abstract class LitChunkGenerator extends PostBlockChunkGenerator -{ - private KList lit; - - public LitChunkGenerator(String dimensionName, int threads) - { - super(dimensionName, threads); - lit = new KList<>(); - } - - protected void queueLight(int x, int y, int z, BlockData d) - { - if(BlockDataTools.isLit(d)) - { - lit.add(new BlockPosition(x, y, z)); - } - } - - @Override - protected void onChunkLoaded(Chunk c) - { - for(BlockPosition i : lit.copy()) - { - if(i.getChunkX() == c.getX() && i.getChunkZ() == c.getZ()) - { - Block b = getWorld().getBlockAt(i.getX(), i.getY(), i.getZ()); - // BlockData d = b.getBlockData(); - b.getState().update(true, true); - lit.remove(i); - } - } - - Iris.info("Lit: " + lit.size()); - } -} diff --git a/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java b/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java index e94796cdc..4fb997f40 100644 --- a/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java @@ -188,7 +188,6 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator } sliver.set(k, block); - lit(rx, k, rz, block); highestPlaced = Math.max(highestPlaced, k); if(!cavernSurface && (k == height && block.getMaterial().isSolid() && k < fluidHeight))