diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java index 769a00235..42ab5583e 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/AbstractLodTemplate.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.bufferBuilding.lodTemplates; -import java.util.Map; +package com.seibel.lod.builders.bufferBuilding.lodTemplates; import com.seibel.lod.enums.DebugMode; import com.seibel.lod.util.ColorUtil; - import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.NativeImage; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import java.util.Map; + /** * This is the abstract class used to create different * BufferBuilders. diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java index 52f6f7bd2..153f71cea 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/CubicLodTemplate.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.bufferBuilding.lodTemplates; -import java.util.Map; +package com.seibel.lod.builders.bufferBuilding.lodTemplates; import com.seibel.lod.enums.DebugMode; import com.seibel.lod.util.DataPointUtil; import com.seibel.lod.util.LodUtil; - import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.NativeImage; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import java.util.Map; + /** * Builds LODs as rectangular prisms. * @@ -39,7 +39,7 @@ public class CubicLodTemplate extends AbstractLodTemplate public CubicLodTemplate() { - + } @Override @@ -73,11 +73,11 @@ public class CubicLodTemplate extends AbstractLodTemplate addBoundingBoxToBuffer(buffer, box); } - private void generateBoundingBox(Box box, - int height, int depth, int width, - double xOffset, double yOffset, double zOffset, - BlockPos bufferCenterBlockPos, - Map adjData, + private void generateBoundingBox(Box box, + int height, int depth, int width, + double xOffset, double yOffset, double zOffset, + BlockPos bufferCenterBlockPos, + Map adjData, int color, boolean[] adjShadeDisabled) { @@ -130,7 +130,7 @@ public class CubicLodTemplate extends AbstractLodTemplate public int getBufferMemoryForSingleNode(int maxVerticalData) { // TODO, what do these magic numbers mean - return 2 * 4 * (3 + 4) + 4 * 4 * Math.max((maxVerticalData+1)/2,1) * (3 + 4); + return 2 * 4 * (3 + 4) + 4 * 4 * Math.max((maxVerticalData + 1) / 2, 1) * (3 + 4); } } diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java index 399a7a87f..0713d9fae 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/DynamicLodTemplate.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.bufferBuilding.lodTemplates; -import java.util.Map; +package com.seibel.lod.builders.bufferBuilding.lodTemplates; import com.seibel.lod.enums.DebugMode; import com.seibel.lod.proxy.ClientProxy; - import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.NativeImage; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import java.util.Map; + /** * TODO DynamicLodTemplate * Chunks smoothly transition between @@ -40,11 +40,11 @@ public class DynamicLodTemplate extends AbstractLodTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, BlockPos bufferCenterBlockPos, long data, Map adjData, - byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled) + byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled) { ClientProxy.LOGGER.error(DynamicLodTemplate.class.getSimpleName() + " is not implemented!"); } - + @Override public int getBufferMemoryForSingleNode(int maxVerticalData) { diff --git a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java index 874339aa0..7fa70cf61 100644 --- a/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java +++ b/src/main/java/com/seibel/lod/builders/bufferBuilding/lodTemplates/TriangularLodTemplate.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.seibel.lod.builders.bufferBuilding.lodTemplates; -import java.util.Map; +package com.seibel.lod.builders.bufferBuilding.lodTemplates; import com.seibel.lod.enums.DebugMode; import com.seibel.lod.proxy.ClientProxy; - import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.NativeImage; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import java.util.Map; + /** * TODO #21 TriangularLodTemplate * Builds each LOD chunk as a singular rectangular prism. @@ -38,11 +38,11 @@ public class TriangularLodTemplate extends AbstractLodTemplate { @Override public void addLodToBuffer(BufferBuilder buffer, BlockPos bufferCenterBlockPos, long data, Map adjData, - byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled) + byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled) { ClientProxy.LOGGER.error(DynamicLodTemplate.class.getSimpleName() + " is not implemented!"); } - + @Override public int getBufferMemoryForSingleNode(int maxVerticalData) { diff --git a/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java b/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java index 7e0a0ed0e..5502462a4 100644 --- a/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java +++ b/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilder.java @@ -729,7 +729,7 @@ public class LodBuilder } // determine if this block should use the biome color tint - if (block instanceof TallGrassBlock || (useGrassTint(block) || useLeafTint(block) || useWaterTint(block)) && numberOfGreyPixel / count > 0.75f) + if (block instanceof TallGrassBlock || (useGrassTint(block) || useLeafTint(block) || useWaterTint(block)) && (float) numberOfGreyPixel / count > 0.75f) toTint.replace(block, true); // add the newly generated block color to the map for later use @@ -792,7 +792,7 @@ public class LodBuilder } blockColor = getColorTextureForBlock(blockState, blockPos, true); - if (toTint.get(blockState.getBlock()).booleanValue()) + if (toTint.get(blockState.getBlock())) { if (useLeafTint(blockState.getBlock())) // leaves diff --git a/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilderConfig.java b/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilderConfig.java index 679779d6e..32d099eda 100644 --- a/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilderConfig.java +++ b/src/main/java/com/seibel/lod/builders/lodBuilding/LodBuilderConfig.java @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + package com.seibel.lod.builders.lodBuilding; import com.seibel.lod.enums.DistanceGenerationMode; @@ -38,7 +39,7 @@ public class LodBuilderConfig public boolean useSolidBlocksInColorGen; /** default: server */ public DistanceGenerationMode distanceGenerationMode; - + /** * default settings for a normal chunk
* useHeightmap = false
@@ -53,7 +54,7 @@ public class LodBuilderConfig useSolidBlocksInColorGen = true; distanceGenerationMode = DistanceGenerationMode.SERVER; } - + /** * @param newUseHeightmap default = false * @param newUseBiomeColors default = false @@ -61,14 +62,14 @@ public class LodBuilderConfig * @param newDistanceGenerationMode default = Server */ public LodBuilderConfig(boolean newUseHeightmap, boolean newUseBiomeColors, - boolean newUseSolidBlocksInBiomeColor, DistanceGenerationMode newDistanceGenerationMode) + boolean newUseSolidBlocksInBiomeColor, DistanceGenerationMode newDistanceGenerationMode) { useHeightmap = newUseHeightmap; useBiomeColors = newUseBiomeColors; useSolidBlocksInColorGen = newUseSolidBlocksInBiomeColor; distanceGenerationMode = newDistanceGenerationMode; } - + /** * @param newUseHeightmap default = false * @param newUseBiomeColors default = false @@ -81,9 +82,9 @@ public class LodBuilderConfig useHeightmap = newUseHeightmap; useBiomeColors = newUseBiomeColors; useSolidBlocksInColorGen = newUseSolidBlocksInBiomeColor; - distanceGenerationMode = newUseHeightmap? DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT : DistanceGenerationMode.BIOME_ONLY; + distanceGenerationMode = newUseHeightmap ? DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT : DistanceGenerationMode.BIOME_ONLY; } - + /** * @param newUseHeightmap default = false * @param newUseBiomeColors default = false diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java index f7311b7f6..1678bc50d 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodNodeGenWorker.java @@ -531,7 +531,7 @@ public class LodNodeGenWorker implements IWorker @SuppressWarnings({ "rawtypes", "unchecked", "unused" }) private DecoratedFeatureConfig cloneDecoratedFeatureConfig(DecoratedFeatureConfig config) { - IPlacementConfig placementConfig = null; + IPlacementConfig placementConfig; Class oldConfigClass = config.decorator.config().getClass(); diff --git a/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java b/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java index 062114b1c..1d2242354 100644 --- a/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java +++ b/src/main/java/com/seibel/lod/builders/worldGeneration/LodWorldGenerator.java @@ -33,7 +33,7 @@ public class LodWorldGenerator public MinecraftWrapper mc = MinecraftWrapper.INSTANCE; /** This holds the thread used to generate new LODs off the main thread. */ - private ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName() + " world generator")); + private final ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName() + " world generator")); /** we only want to queue up one generator thread at a time */ private boolean generatorThreadRunning = false;