diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java index 2c0facc33..041c09f1c 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java @@ -270,7 +270,7 @@ public class ColumnBox // skip empty adjacent datapoints if (!RenderDataPointUtil.doesDataPointExist(adjPoint) - || RenderDataPointUtil.isVoid(adjPoint)) + || RenderDataPointUtil.isVoid(adjPoint)) { continue; } @@ -288,7 +288,9 @@ public class ColumnBox // if the adjacent data point is over the void // don't consider it as transparent boolean adjOverVoid = !RenderDataPointUtil.doesDataPointExist(adjBelowPoint); - boolean adjTransparent = !adjOverVoid && RenderDataPointUtil.getAlpha(adjPoint) < 255 && transparencyEnabled; + boolean adjTransparent = !adjOverVoid + && RenderDataPointUtil.getAlpha(adjPoint) < 255 + && transparencyEnabled; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java index 6371db4ac..f8b35ece8 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java @@ -185,21 +185,11 @@ public final class ColumnArrayView implements IColumnDataView { for (int i = 0; i < this.dataCount(); i++) { - RenderDataPointUtil.mergeMultiData(source.subView(i, 1), subView(i, 1)); + RenderDataPointUtil.mergeMultiData(source.subView(i, 1), this.subView(i, 1)); } } } - public void mergeMultiDataFrom(IColumnDataView source) - { - if (dataCount() != 1) - { - throw new IllegalArgumentException("output dataCount must be 1"); - } - - RenderDataPointUtil.mergeMultiData(source, this); - } - //================// @@ -210,15 +200,15 @@ public final class ColumnArrayView implements IColumnDataView public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("S:").append(size); - sb.append(" V:").append(verticalSize); - sb.append(" O:").append(offset); + sb.append("S:").append(this.size); + sb.append(" V:").append(this.verticalSize); + sb.append(" O:").append(this.offset); sb.append(" ["); - for (int i = 0; i < size; i++) + for (int i = 0; i < this.size; i++) { - sb.append(RenderDataPointUtil.toString(data.getLong(offset + i))); - if (i < size - 1) + sb.append(RenderDataPointUtil.toString(this.data.getLong(this.offset + i))); + if (i < this.size - 1) { sb.append(",\n"); } @@ -229,11 +219,7 @@ public final class ColumnArrayView implements IColumnDataView } - public int getDataHash() - { - return arrayHash(data, offset, size); - } - + public int getDataHash() { return arrayHash(this.data, this.offset, this.size); } private static int arrayHash(LongArrayList a, int offset, int length) { if (a == null) @@ -252,4 +238,6 @@ public final class ColumnArrayView implements IColumnDataView return result; } + + } \ No newline at end of file diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java index 613618a98..0ea338aba 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java @@ -368,7 +368,9 @@ public class FullDataToRenderDataTransformer //=============================// // check if they share a top-bottom face and if they have same color - if (color == lastColor && bottomY + blockHeight == lastBottom && renderDataIndex > 0) + if (color == lastColor + && bottomY + blockHeight == lastBottom + && renderDataIndex > 0) { //replace the previous block with new bottom long columnData = renderColumnData.get(renderDataIndex - 1);