resolved warnings. part 3

This commit is contained in:
cola98765
2022-01-18 11:29:01 +01:00
parent 6b6d011cd5
commit 546d60f1fc
4 changed files with 15 additions and 15 deletions
@@ -107,7 +107,6 @@ public enum DistanceGenerationMode
case BIOME_ONLY:
return DistanceGenerationMode.NONE;
case NONE:
return null;
default:
return null;
}
@@ -116,8 +115,6 @@ public enum DistanceGenerationMode
// Note: return null if out of range
public static DistanceGenerationMode next(DistanceGenerationMode mode) {
switch (mode) {
case FULL:
return null;
case FEATURES:
return DistanceGenerationMode.FULL;
case SURFACE:
@@ -128,6 +125,7 @@ public enum DistanceGenerationMode
return DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
case NONE:
return DistanceGenerationMode.BIOME_ONLY;
case FULL:
default:
return null;
}
@@ -60,7 +60,6 @@ public enum VerticalQuality
case MEDIUM:
return VerticalQuality.LOW;
case LOW:
return null;
default:
return null;
}
@@ -69,12 +68,11 @@ public enum VerticalQuality
// Note: return null if out of range
public static VerticalQuality next(VerticalQuality mode) {
switch (mode) {
case HIGH:
return null;
case MEDIUM:
return VerticalQuality.HIGH;
case LOW:
return VerticalQuality.MEDIUM;
case HIGH:
default:
return null;
}
@@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentMap;
public class BlockBiomeCouple
{
public static ConcurrentMap<IBlockColorWrapper, BlockBiomeCouple> noBiomeIstanceCache = new ConcurrentHashMap<>();
public static final ConcurrentMap<IBlockColorWrapper, BlockBiomeCouple> noBiomeIstanceCache = new ConcurrentHashMap<>();
public static ConcurrentMap<IBiomeWrapper, ConcurrentMap<IBlockColorWrapper, BlockBiomeCouple>> withBiomeIstanceCache = new ConcurrentHashMap<>();
String blockName;
@@ -417,12 +417,14 @@ public class VerticalLevelContainer implements LevelContainer
//STEP 1//
//We initially reset this position of the data container
positionDataContainer[posX * size + posZ] = PositionDataFormat.EMPTY_DATA;
final int indexA = posX * size + posZ;
positionDataContainer[indexA] = PositionDataFormat.EMPTY_DATA;
for (int verticalIndex = 0; verticalIndex < verticalSize; verticalIndex++)
{
verticalDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = VerticalDataFormat.EMPTY_LOD;
lightDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0;
colorDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0;
final int indexB = indexA * verticalSize + verticalIndex;
verticalDataContainer[indexB] = VerticalDataFormat.EMPTY_LOD;
lightDataContainer[indexB] = 0;
colorDataContainer[indexB] = 0;
}
@@ -756,12 +758,14 @@ public class VerticalLevelContainer implements LevelContainer
//SPLITTED VERSION OF THE MERGE AND ADD
private void resetPosition(int posX, int posZ)
{
positionDataContainer[posX * size + posZ] = PositionDataFormat.EMPTY_DATA;
final int indexA = posX * size + posZ;
positionDataContainer[indexA] = PositionDataFormat.EMPTY_DATA;
for (int verticalIndex = 0; verticalIndex < verticalSize; verticalIndex++)
{
verticalDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = VerticalDataFormat.EMPTY_LOD;
lightDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0;
colorDataContainer[posX * size * verticalSize + posZ * verticalSize + verticalIndex] = 0;
final int indexB = indexA * verticalSize + verticalIndex;
verticalDataContainer[indexB] = VerticalDataFormat.EMPTY_LOD;
lightDataContainer[indexB] = 0;
colorDataContainer[indexB] = 0;
}
}