wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.16.5' of https://gitlab.com/jeseibel/minecraft-lod-mod into vertical_merging

Browse Source 
 Conflicts:
	src/main/java/com/seibel/lod/objects/VerticalLevelContainer.java
	src/main/java/com/seibel/lod/util/DataPointUtil.java
This commit is contained in:
cola98765
2021-09-19 23:31:16 +02:00
parent c89cd54429 d8200422b2
commit 031af5f25c
9 changed files with 253 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/util/DataPointUtil.java
+5 -2
View File
@@ -4,6 +4,9 @@ import com.seibel.lod.enums.DistanceGenerationMode;
import net.minecraft.client.renderer.texture.NativeImage;
import java.lang.reflect.Array;
import java.util.Arrays;
public class DataPointUtil
{
/*
@@ -281,7 +284,7 @@ public class DataPointUtil
int size = dataToMerge.length / inputVerticalData;
short[] projection = ThreadMapUtil.getProjectionShort((WORLD_HEIGHT + 1) / 16);
short[][] heightAndDepth = ThreadMapUtil.getHeightAndDepth(inputVerticalData);
long[] singleDataToMerge = ThreadMapUtil.getSingleAddDataToMerge(dataToMerge.length);
long[] singleDataToMerge = ThreadMapUtil.getSingleAddDataToMerge(size);
int genMode = DistanceGenerationMode.SERVER.complexity;
boolean allEmpty = true;
boolean allVoid = true;
@@ -383,7 +386,7 @@ public class DataPointUtil
{
depth = heightAndDepth[j][0];
height = heightAndDepth[j][1];
for(int k = 0; k < dataToMerge.length; k++){
for(int k = 0; k < size; k++){
singleDataToMerge[k] = 0;
}
for (int index = 0; index < size; index++)