halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

fixed all warnings

pull/12/head
hYdos 2020-02-28 15:10:50 +10:00
parent 3e89d1ad7d
commit 2f7ad5b2b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/github/halotroop/litecraft/world/Chunk.java
View File

@ -19,7 +19,7 @@ public class Chunk implements BlockAccess, WorldGenConstants, DataStorage
* @param y in-chunk y coordinate.
* @param z in-chunk z coordinate.
* @return creates a long that represents a coordinate, for use as a key in maps. */
private static long posHash(int x, int y, int z)
public static long posHash(int x, int y, int z)
{ return ((long) x & MAX_POS) | (((long) y & MAX_POS) << POS_SHIFT) | (((long) z & MAX_POS) << DOUBLE_SHIFT); }
private final Block[] blocks = new Block[CHUNK_SIZE * CHUNK_SIZE * CHUNK_SIZE];
@ -187,7 +187,7 @@ public class Chunk implements BlockAccess, WorldGenConstants, DataStorage
Object2IntMap<Block> palette = new Object2IntArrayMap<>(); // block to int id
DataSection paletteData = new DataSection();
DataSection blockData = new DataSection();
long posHash = 0L;
// long posHash = 0L; Why is this here?
nextId = 0;
ToIntFunction<Block> nextIdProvider = b -> nextId++;
for (int z = 0; z < CHUNK_SIZE; ++z) // z, y, x order for data saving and loading so we can use incremental pos hashes
@ -198,7 +198,7 @@ public class Chunk implements BlockAccess, WorldGenConstants, DataStorage
{
Block b = blocks[x * CHUNK_SIZE * CHUNK_SIZE + z * CHUNK_SIZE + y];
blockData.writeInt(palette.computeIntIfAbsent(b, nextIdProvider));
++posHash;
// ++posHash; and this
}
}
}