From 7acad77eda26e4a9f07551ac14e28928c7013d4b Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 26 Feb 2021 17:40:53 -0600 Subject: [PATCH] Fix LOD color generation --- .../java/com/backsun/lod/builders/LodBuilder.java | 4 ++-- src/main/java/com/backsun/lod/objects/LodChunk.java | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/backsun/lod/builders/LodBuilder.java b/src/main/java/com/backsun/lod/builders/LodBuilder.java index cce1ddd5e..ffbf0cbc5 100644 --- a/src/main/java/com/backsun/lod/builders/LodBuilder.java +++ b/src/main/java/com/backsun/lod/builders/LodBuilder.java @@ -10,9 +10,9 @@ import com.backsun.lod.objects.LodWorld; import com.backsun.lod.util.LodUtils; import net.minecraft.world.DimensionType; -import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; +import net.minecraft.world.server.ServerWorld; /** * This object is in charge of creating Lod @@ -53,7 +53,7 @@ public class LodBuilder DimensionType dim = chunk.getWorld().getDimensionType(); - World world = LodUtils.getServerWorldFromDimension(dim); + ServerWorld world = LodUtils.getServerWorldFromDimension(dim); if (world == null) diff --git a/src/main/java/com/backsun/lod/objects/LodChunk.java b/src/main/java/com/backsun/lod/objects/LodChunk.java index 15646b5b6..6bc10b3fe 100644 --- a/src/main/java/com/backsun/lod/objects/LodChunk.java +++ b/src/main/java/com/backsun/lod/objects/LodChunk.java @@ -9,7 +9,6 @@ import com.backsun.lod.util.enums.LodLocation; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.BlockColors; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; @@ -497,11 +496,7 @@ public class LodChunk for(int y = topStart; !foundBlock && y >= topMin && y < topMax; y += topIncrement) { int ci; - if(chunkSections[i].getBlockState(x, y, z).getBlock() == Blocks.WATER) - // this is a special case since getColor on water generally returns white - ci = waterColor; - else - ci = bc.getColor(chunkSections[i].getBlockState(x, y, z), null, new BlockPos(x,y,z), 0); + ci = chunkSections[i].getBlockState(x, y, z).getMaterial().getColor().colorValue; if(ci == 0) { @@ -635,11 +630,7 @@ public class LodChunk } int ci; - if(chunkSections[i].getBlockState(x, y, z).getBlock() == Blocks.WATER) - // this is a special case since getColor on water generally returns white - ci = waterColor; - else - ci = bc.getColor(chunkSections[i].getBlockState(x, y, z), null, new BlockPos(x,y,z), 0); + ci = chunkSections[i].getBlockState(x, y, z).getMaterial().getColor().colorValue; if (ci == 0) { // skip air or invisible blocks