Skip to content

Commit

Permalink
everything except tile entities works now
Browse files Browse the repository at this point in the history 
alt attempt: https://one.denizenscript.com/haste/59289
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Oct 23, 2019
1 parent 37ba7b0 commit d262e91
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 30 deletions.
5 changes: 3 additions & 2 deletions plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java
View file
Expand Up @@ -14,6 +14,7 @@
import com.denizenscript.denizencore.scripts.ScriptEntry;
import com.denizenscript.denizencore.scripts.commands.AbstractCommand;

import java.util.ArrayList;
import java.util.List;

public class ShowFakeCommand extends AbstractCommand {
Expand Down Expand Up @@ -95,8 +96,8 @@ else if (!scriptEntry.hasObject("locations")
}

if (!scriptEntry.hasObject("players") && Utilities.entryHasPlayer(scriptEntry)) {
ListTag players = new ListTag();
players.addObject(Utilities.getEntryPlayer(scriptEntry));
List<PlayerTag> players = new ArrayList<>();
players.add(Utilities.getEntryPlayer(scriptEntry));
scriptEntry.defaultObject("players", players);
}

Expand Down
79 changes: 51 additions & 28 deletions .../main/java/com/denizenscript/denizen/nms/v1_14/impl/network/handlers/FakeBlockHelper.java
View file
Expand Up @@ -8,6 +8,7 @@
import org.bukkit.craftbukkit.v1_14_R1.block.data.CraftBlockData;

import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;

public class FakeBlockHelper {
Expand All @@ -33,6 +34,16 @@ public static boolean anyBlocksInSection(List<FakeBlock> blocks, int y) {
return false;
}

public static void pushByteArrayToLongArrayBE(byte[] bits, long[] longs) {
for (int i = 0; i < bits.length; i++) {
int longIndex = i >> 3;
int startBit = longIndex * 8;
if (longIndex >= longs.length) {
break;
}
longs[longIndex] |= ((long) bits[i]) << (7 - (i - startBit));
}
}
public static IBlockData blockInPalette(int paletteId) {
return ChunkSection.GLOBAL_PALETTE.a(paletteId);
}
Expand Down Expand Up @@ -68,29 +79,18 @@ public static void writeWideInt(PacketDataSerializer serial, int value, int widt
}
}

public static int getWidthFor(int value) {
if (value < 256) {
return 1;
}
if (value < 256 * 256) {
return 2;
}
if (value < 256 * 256 * 256) {
return 3;
}
return 4;
}

public static void handleMapChunkPacket(PacketPlayOutMapChunk packet, List<FakeBlock> blocks) {
try {
// TODO: properly update HeightMap and BlockEntities?
// TODO: properly update HeightMap?
int bitmask = BITMASK_MAPCHUNK.getInt(packet);
byte[] data = (byte[]) DATA_MAPCHUNK.get(packet);
PacketDataSerializer serial = new PacketDataSerializer(Unpooled.wrappedBuffer(data));
PacketDataSerializer outputSerial = new PacketDataSerializer(Unpooled.buffer(data.length));
byte[] blockDataHelper = new byte[4 * 16 * 16 * 16]; // 16,384
int[] blockListHelper = new int[16 * 16 * 16];

boolean isFull = packet.f();
// TODO: Handle blockEntities?
//List<NBTTagCompound> blockEntities = (List<NBTTagCompound>) BLOCKENTITIES_MAPCHUNK.get(packet);
//NBTTagList blockEntitiesList = new NBTTagList();
//blockEntitiesList.addAll(blockEntities);
for (int y = 0; y < 16; y++) {
if ((bitmask & (1 << y)) != 0) {
int blockCount = serial.readShort();
Expand All @@ -101,21 +101,23 @@ public static void handleMapChunkPacket(PacketPlayOutMapChunk packet, List<FakeB
palette[p] = serial.i();
}
int dataLen = serial.i();
serial.readBytes(blockDataHelper, 0, dataLen * width);
Debug.log("y: " + y + " count: " + blockCount + ", width: " + width + ", paletteLen: " + paletteLen + ", palette: " + Arrays.toString(palette) + ", dataLen: " + dataLen);
long[] blockListHelper = new long[dataLen];
for (int i = 0; i < blockListHelper.length; i++) {
blockListHelper[i] = serial.readLong();
}
Debug.log("Data: " + Arrays.toString(blockListHelper));
outputSerial.writeShort(blockCount);
if (!anyBlocksInSection(blocks, y)) {
outputSerial.writeShort(blockCount);
outputSerial.writeByte(width);
outputSerial.d(paletteLen); // writeVarInt
for (int p = 0; p < paletteLen; p++) {
outputSerial.d(palette[p]);
}
outputSerial.d(dataLen);
outputSerial.writeBytes(blockDataHelper, 0, dataLen * width);
outputSerial.a(blockListHelper); // writeLongs
continue;
}
for (int i = 0; i < blockListHelper.length; i++) {
blockListHelper[i] = getWideIntAt(blockDataHelper, i * width, width);
}
DataBits bits = new DataBits(width, 4096, blockListHelper);
int minY = y << 4;
int maxY = (y << 4) + 16;
for (FakeBlock block : blocks) {
Expand All @@ -139,16 +141,37 @@ public static void handleMapChunkPacket(PacketPlayOutMapChunk packet, List<FakeB
subPaletteId = paletteLen;
paletteLen++;
palette = newPalette;
int newWdith = MathHelper.d(paletteLen);
if (newWdith > width) {
DataBits newBits = new DataBits(newWdith, 4096);
for (int i = 0; i < bits.b(); i++) {
newBits.a(i, bits.a(i));
}
bits = newBits;
width = newWdith;
}
}
blockListHelper[blockIndex] = subPaletteId;
bits.a(blockIndex, subPaletteId);
}
}
width = getWidthFor(paletteLen);
for (int i = 0; i < blockListHelper.length; i++) {
writeWideInt(outputSerial, blockListHelper[i], width);
int[] testOut = new int[bits.b()];
for (int i = 0; i < testOut.length; i++) {
testOut[i] = bits.a(i);
}
Debug.log("Blocks: " + Arrays.toString(testOut));
outputSerial.writeByte(width);
outputSerial.d(paletteLen);
Debug.log("Palette: " + Arrays.toString(palette) + ", endWidth: " + width);
for (int p = 0; p < palette.length; p++) {
outputSerial.d(palette[p]);
}
outputSerial.a(bits.a());
}
}
if (isFull) {
// biomes
outputSerial.writeBytes(serial, 256 * 4);
}
byte[] outputBytes = outputSerial.array();
DATA_MAPCHUNK.set(packet, outputBytes);
}
Expand Down

0 comments on commit d262e91

Please sign in to comment.