Minecraft/mc-core
Archived
0
Fork 0
Code Activity

Merge branch 'develop' into dmitriymx/location-refactory

Browse Source 
# Conflicts:
#	core/src/main/java/mc/core/Location.java
#	flat_world/src/main/java/mc/world/flat/FlatWorld.java
#	generated_world/src/main/java/mc/world/generated_world/world/CubicWorld.java
#	proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
This commit is contained in:
DmitriyMX
2018-08-10 12:00:13 +03:00
parent 9b35c63333 d5b57a8284
commit 63d6716ce3
65 changed files with 2132 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/ChunkDataPacket.java
View File

@@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j;
import mc.core.network.NetOutputStream;
import mc.core.network.SCPacket;
import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream;
import mc.core.world.ChunkSection;
import mc.core.world.block.Block;
import mc.core.world.chunk.Chunk;
import java.util.ArrayList;
import java.util.List;
@@ -76,7 +76,7 @@ public class ChunkDataPacket implements SCPacket {
@Setter
private boolean initChunk = true; // "Ground-Up Continuous"
@Getter
private List<Chunk> chunks = new ArrayList<>();
private List<ChunkSection> chunks = new ArrayList<>();
private int serializeBlockState(int id, int meta) {
return (id << 4) | meta;
@@ -93,7 +93,7 @@ public class ChunkDataPacket implements SCPacket {
int dataItems = 0;
final int airBlockPalette = serializeBlockState(0, 0);
for (Chunk chunk : chunks) {
for (ChunkSection chunk : chunks) {
final List<Integer> palette = new ArrayList<>();
palette.add(airBlockPalette);
final ByteArrayOutputNetStream dataArray = new ByteArrayOutputNetStream();

12
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/SpawnPositionPacket.java
View File

@@ -8,7 +8,7 @@ import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import mc.core.Location;
import mc.core.EntityLocation;
import mc.core.network.NetOutputStream;
import mc.core.network.SCPacket;
@@ -17,17 +17,17 @@ import mc.core.network.SCPacket;
@Setter
@ToString
public class SpawnPositionPacket implements SCPacket {
private Location location;
private EntityLocation location;
private int floor_double(double value) {
int i = (int)value;
return value < (double)i ? i - 1 : i;
}
private long location2long(Location location) {
return ((floor_double(location.getX()) & 0x3FFFFFF) << 38)
| ((floor_double(location.getY()) & 0xFFF) << 26)
| (floor_double(location.getZ()) & 0x3FFFFFF);
private long location2long(EntityLocation entityLocation) {
return ((floor_double(entityLocation.getX()) & 0x3FFFFFF) << 38)
| ((floor_double(entityLocation.getY()) & 0xFFF) << 26)
| (floor_double(entityLocation.getZ()) & 0x3FFFFFF);
}
@Override