mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Redned
GitHub
commit
2b72082a6f
8 changed files with 13746 additions and 9622 deletions
|
|
@ -92,29 +92,38 @@ public class GeyserLogger implements org.geysermc.api.logger.Logger {
|
|||
|
||||
@Override
|
||||
public void severe(String message) {
|
||||
waitFor();
|
||||
System.out.println(printConsole(ChatColor.DARK_RED + message, colored));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(String message) {
|
||||
waitFor();
|
||||
System.out.println(printConsole(ChatColor.RED + message, colored));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void warning(String message) {
|
||||
waitFor();
|
||||
System.out.println(printConsole(ChatColor.YELLOW + message, colored));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void info(String message) {
|
||||
waitFor();
|
||||
System.out.println(printConsole(ChatColor.WHITE + message, colored));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(String message) {
|
||||
waitFor();
|
||||
System.out.println(printConsole(ChatColor.GRAY + message, colored));
|
||||
}
|
||||
|
||||
private synchronized void waitFor() {
|
||||
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,10 @@ import com.nukkitx.protocol.bedrock.BedrockPong;
|
|||
import com.nukkitx.protocol.bedrock.BedrockServerEventHandler;
|
||||
import com.nukkitx.protocol.bedrock.BedrockServerSession;
|
||||
import com.nukkitx.protocol.bedrock.v361.Bedrock_v361;
|
||||
import org.geysermc.api.Geyser;
|
||||
import org.geysermc.connector.GeyserConnector;
|
||||
import org.geysermc.connector.configuration.GeyserConfiguration;
|
||||
import org.geysermc.connector.console.GeyserLogger;
|
||||
import org.geysermc.connector.network.session.GeyserSession;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
|
|
@ -45,13 +47,13 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
|
|||
|
||||
@Override
|
||||
public boolean onConnectionRequest(InetSocketAddress inetSocketAddress) {
|
||||
System.out.println(inetSocketAddress + " tried to connect!");
|
||||
GeyserLogger.DEFAULT.info(inetSocketAddress + " tried to connect!");
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BedrockPong onQuery(InetSocketAddress inetSocketAddress) {
|
||||
System.out.println(inetSocketAddress + " has pinged you!");
|
||||
GeyserLogger.DEFAULT.info(inetSocketAddress + " has pinged you!");
|
||||
GeyserConfiguration config = connector.getConfig();
|
||||
BedrockPong pong = new BedrockPong();
|
||||
pong.setEdition("MCPE");
|
||||
|
|
@ -63,6 +65,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
|
|||
pong.setNintendoLimited(false);
|
||||
pong.setProtocolVersion(GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion());
|
||||
pong.setVersion("1.12.0");
|
||||
pong.setIpv4Port(19132);
|
||||
|
||||
return pong;
|
||||
}
|
||||
|
|
@ -71,7 +74,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler {
|
|||
public void onSessionCreation(BedrockServerSession bedrockServerSession) {
|
||||
bedrockServerSession.setLogging(true);
|
||||
bedrockServerSession.setPacketHandler(new UpstreamPacketHandler(connector, new GeyserSession(connector, bedrockServerSession)));
|
||||
bedrockServerSession.addDisconnectHandler((x) -> System.out.println("Bedrock user with ip: " + bedrockServerSession.getAddress().getAddress() + " has disconected for reason " + x));
|
||||
bedrockServerSession.addDisconnectHandler((x) -> GeyserLogger.DEFAULT.warning("Bedrock user with ip: " + bedrockServerSession.getAddress().getAddress() + " has disconnected for reason " + x));
|
||||
bedrockServerSession.setPacketCodec(Bedrock_v361.V361_CODEC);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ package org.geysermc.connector.network.translators;
|
|||
|
||||
import com.github.steveice10.packetlib.packet.Packet;
|
||||
import org.geysermc.api.Geyser;
|
||||
import org.geysermc.connector.console.GeyserLogger;
|
||||
import org.geysermc.connector.network.session.GeyserSession;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
|
@ -47,7 +48,7 @@ public class Registry<T> {
|
|||
try {
|
||||
((BiConsumer<P, GeyserSession>) JAVA.MAP.get(clazz)).accept(p, s);
|
||||
} catch (NullPointerException e) {
|
||||
System.err.println("could not translate packet" + p.getClass().getSimpleName());
|
||||
GeyserLogger.DEFAULT.warning("could not translate packet " + p.getClass().getSimpleName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,56 +26,82 @@
|
|||
package org.geysermc.connector.network.translators;
|
||||
|
||||
import com.flowpowered.math.vector.Vector2f;
|
||||
import com.flowpowered.math.vector.Vector2i;
|
||||
import com.flowpowered.math.vector.Vector3f;
|
||||
import com.flowpowered.math.vector.Vector3i;
|
||||
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
|
||||
import com.github.steveice10.mc.protocol.packet.ingame.server.entity.player.ServerPlayerAbilitiesPacket;
|
||||
import com.nukkitx.nbt.CompoundTagBuilder;
|
||||
import com.nukkitx.nbt.NbtUtils;
|
||||
import com.nukkitx.nbt.stream.NBTOutputStream;
|
||||
import com.nukkitx.nbt.tag.CompoundTag;
|
||||
import com.nukkitx.network.VarInts;
|
||||
import com.nukkitx.protocol.bedrock.data.GamePublishSetting;
|
||||
import com.nukkitx.protocol.bedrock.data.GameRule;
|
||||
import com.nukkitx.protocol.bedrock.packet.*;
|
||||
import com.nukkitx.protocol.bedrock.v340.serializer.FullChunkDataSerializer_v340;
|
||||
import com.nukkitx.protocol.bedrock.v340.serializer.ResourcePackChunkDataSerializer_v340;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufOutputStream;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import org.geysermc.connector.utils.GeyserUtils;
|
||||
import org.geysermc.connector.utils.Toolbox;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class TranslatorsInit {
|
||||
private static final CompoundTag EMPTY_TAG = CompoundTagBuilder.builder().buildRootTag();
|
||||
private static final byte[] EMPTY_LEVEL_CHUNK_DATA;
|
||||
|
||||
static {
|
||||
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
|
||||
outputStream.write(new byte[258]); // Biomes + Border Size + Extra Data Size
|
||||
|
||||
try (NBTOutputStream stream = NbtUtils.createNetworkWriter(outputStream)) {
|
||||
stream.write(EMPTY_TAG);
|
||||
}
|
||||
|
||||
EMPTY_LEVEL_CHUNK_DATA = outputStream.toByteArray();
|
||||
}catch (IOException e) {
|
||||
throw new AssertionError("Unable to generate empty level chunk data");
|
||||
}
|
||||
}
|
||||
|
||||
public static void start() {
|
||||
addLoginPackets();
|
||||
}
|
||||
|
||||
private static void addLoginPackets() {
|
||||
Registry.add(ServerJoinGamePacket.class, (x, y) -> {
|
||||
Registry.add(ServerJoinGamePacket.class, (packet, session) -> {
|
||||
AdventureSettingsPacket bedrockPacket = new AdventureSettingsPacket();
|
||||
|
||||
bedrockPacket.setUniqueEntityId(x.getEntityId());
|
||||
bedrockPacket.setUniqueEntityId(packet.getEntityId());
|
||||
|
||||
y.getUpstream().sendPacketImmediately(bedrockPacket);
|
||||
|
||||
System.out.println(y.getUpstream().isClosed());
|
||||
session.getUpstream().sendPacketImmediately(bedrockPacket);
|
||||
|
||||
StartGamePacket startGamePacket = new StartGamePacket();
|
||||
startGamePacket.setUniqueEntityId(x.getEntityId());
|
||||
startGamePacket.setRuntimeEntityId(x.getEntityId());
|
||||
startGamePacket.setPlayerGamemode(x.getGameMode().ordinal());
|
||||
startGamePacket.setUniqueEntityId(packet.getEntityId());
|
||||
startGamePacket.setRuntimeEntityId(packet.getEntityId());
|
||||
startGamePacket.setPlayerGamemode(packet.getGameMode().ordinal());
|
||||
startGamePacket.setPlayerPosition(new Vector3f(0, 0, 0));
|
||||
startGamePacket.setRotation(new Vector2f(1, 1));
|
||||
|
||||
startGamePacket.setSeed(1111);
|
||||
startGamePacket.setDimensionId(0);
|
||||
startGamePacket.setGeneratorId(0);
|
||||
startGamePacket.setLevelGamemode(x.getGameMode().ordinal());
|
||||
startGamePacket.setLevelGamemode(packet.getGameMode().ordinal());
|
||||
startGamePacket.setDifficulty(1);
|
||||
startGamePacket.setDefaultSpawn(new Vector3i(0, 0, 0));
|
||||
startGamePacket.setAcheivementsDisabled(true);
|
||||
startGamePacket.setTime(1300);
|
||||
startGamePacket.setTime(0);
|
||||
startGamePacket.setEduLevel(false);
|
||||
startGamePacket.setEduFeaturesEnabled(false);
|
||||
startGamePacket.setRainLevel(0);
|
||||
startGamePacket.setLightningLevel(0);
|
||||
startGamePacket.setMultiplayerGame(false);
|
||||
startGamePacket.setMultiplayerGame(true);
|
||||
startGamePacket.setBroadcastingToLan(true);
|
||||
startGamePacket.getGamerules().add((new GameRule("showcoordinates", true)));
|
||||
startGamePacket.setPlatformBroadcastMode(GamePublishSetting.FRIENDS_OF_FRIENDS);
|
||||
startGamePacket.setXblBroadcastMode(GamePublishSetting.FRIENDS_OF_FRIENDS);
|
||||
startGamePacket.getGamerules().add(new GameRule<>("showcoordinates", true));
|
||||
startGamePacket.setPlatformBroadcastMode(GamePublishSetting.PUBLIC);
|
||||
startGamePacket.setXblBroadcastMode(GamePublishSetting.PUBLIC);
|
||||
startGamePacket.setCommandsEnabled(true);
|
||||
startGamePacket.setTexturePacksRequired(false);
|
||||
startGamePacket.setBonusChestEnabled(false);
|
||||
|
|
@ -93,48 +119,61 @@ public class TranslatorsInit {
|
|||
startGamePacket.setLevelId("oerjhii");
|
||||
startGamePacket.setWorldName("world");
|
||||
startGamePacket.setPremiumWorldTemplateId("00000000-0000-0000-0000-000000000000");
|
||||
startGamePacket.setCurrentTick(1);
|
||||
startGamePacket.setEnchantmentSeed(1);
|
||||
startGamePacket.setCurrentTick(0);
|
||||
startGamePacket.setEnchantmentSeed(0);
|
||||
startGamePacket.setMultiplayerCorrelationId("");
|
||||
startGamePacket.setCachedPalette(Toolbox.CACHED_PALLETE);
|
||||
startGamePacket.setItemEntries(Toolbox.ITEMS);
|
||||
|
||||
y.getUpstream().sendPacketImmediately(startGamePacket);
|
||||
|
||||
System.out.println(y.getUpstream().isClosed());
|
||||
session.getUpstream().sendPacket(startGamePacket);
|
||||
|
||||
Vector3f pos = new Vector3f(0, 0, 0);
|
||||
|
||||
int chunkX = pos.getFloorX() >> 4;
|
||||
|
||||
int chunkZ = pos.getFloorX() >> 4;
|
||||
int chunkZ = pos.getFloorZ() >> 4;
|
||||
|
||||
for (int x1 = -3; x1 < 3; x1++) {
|
||||
for (int x = -3; x < 3; x++) {
|
||||
|
||||
for (int z = -3; z < 3; z++) {
|
||||
|
||||
LevelChunkPacket data = new LevelChunkPacket();
|
||||
|
||||
data.setChunkX(chunkX + x1);
|
||||
|
||||
data.setChunkX(chunkX + x);
|
||||
data.setChunkZ(chunkZ + z);
|
||||
data.setSubChunksLength(0);
|
||||
|
||||
data.setData(new byte[0]);
|
||||
data.setData(EMPTY_LEVEL_CHUNK_DATA);
|
||||
|
||||
y.getUpstream().sendPacketImmediately(data);
|
||||
|
||||
System.out.println(y.getUpstream().isClosed());
|
||||
session.getUpstream().sendPacketImmediately(data);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
PlayStatusPacket packet = new PlayStatusPacket();
|
||||
PlayStatusPacket packet1 = new PlayStatusPacket();
|
||||
|
||||
packet.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN);
|
||||
packet1.setStatus(PlayStatusPacket.Status.PLAYER_SPAWN);
|
||||
|
||||
y.getUpstream().sendPacket(packet);
|
||||
|
||||
System.out.println(y.getUpstream().isClosed());
|
||||
session.getUpstream().sendPacket(packet1);
|
||||
});
|
||||
}
|
||||
|
||||
private static byte[] empty(byte[] b, Vector2i pos) {
|
||||
ByteBuf by = Unpooled.buffer();
|
||||
|
||||
GeyserUtils.writePEChunkCoord(by, pos);
|
||||
|
||||
return by.array();
|
||||
}
|
||||
|
||||
private static class CanWriteToBB extends ByteArrayOutputStream {
|
||||
|
||||
CanWriteToBB() {
|
||||
super(8192);
|
||||
}
|
||||
|
||||
void writeTo(ByteBuf buf) {
|
||||
buf.writeBytes(super.buf, 0, super.count);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,653 @@
|
|||
package org.geysermc.connector.utils;
|
||||
|
||||
import com.flowpowered.math.vector.Vector2i;
|
||||
import com.flowpowered.math.vector.Vector3d;
|
||||
import com.flowpowered.math.vector.Vector3i;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.handler.codec.DecoderException;
|
||||
|
||||
import java.lang.reflect.Array;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.function.*;
|
||||
|
||||
public class GeyserUtils {
|
||||
|
||||
public static final int FLAG_RUNTIME = 1;
|
||||
|
||||
public static final int GLOBAL_PALETTE_BITS_PER_BLOCK = 14;
|
||||
|
||||
public static final int SECTION_COUNT_BLOCKS = 16;
|
||||
|
||||
public static final int SECTION_COUNT_LIGHT = 18;
|
||||
|
||||
public static final int BLOCKS_IN_SECTION = 16 * 16 * 16;
|
||||
|
||||
public static final int LIGHT_DATA_LENGTH = BLOCKS_IN_SECTION / 2;
|
||||
|
||||
public static final int EMPTY_SUBCHUNK_BYTES = BLOCKS_IN_SECTION / 8;
|
||||
|
||||
public static final int SUBCHUNK_VERSION = 8;
|
||||
|
||||
public static void writeEmpty(ByteBuf to) {
|
||||
|
||||
to.writeByte(storageHeader(1));
|
||||
|
||||
to.writeZero(EMPTY_SUBCHUNK_BYTES);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected static final int storageHeader(int bitsPerBlock) {
|
||||
|
||||
return (bitsPerBlock << 1) | FLAG_RUNTIME;
|
||||
|
||||
}
|
||||
|
||||
public static void writeEmptySubChunk(ByteBuf out) {
|
||||
|
||||
out.writeBytes(new byte[4096 + 4096]);
|
||||
|
||||
}
|
||||
|
||||
public static void skipPosition(ByteBuf from) {
|
||||
from.skipBytes(Long.BYTES);
|
||||
}
|
||||
|
||||
public static Vector3d readPosition(ByteBuf from) {
|
||||
long l = from.readLong();
|
||||
return new Vector3d(
|
||||
(int) (l >> 38), (int) (l & 0xFFF), (int) ((l << 26) >> 38)
|
||||
);
|
||||
}
|
||||
|
||||
public static void readPEPosition(ByteBuf from) {
|
||||
readSVarInt(from);
|
||||
readVarInt(from);
|
||||
readSVarInt(from);
|
||||
}
|
||||
|
||||
public static Vector3d readLegacyPositionI(ByteBuf from) {
|
||||
return new Vector3d(from.readInt(), from.readInt(), from.readInt());
|
||||
}
|
||||
|
||||
public static void writePosition(ByteBuf to, Vector3i position) {
|
||||
to.writeLong(((position.getX() & 0x3FFFFFFL) << 38) | ((position.getZ() & 0x3FFFFFFL) << 12) | (position.getY() & 0xFFFL));
|
||||
}
|
||||
|
||||
public static void writeLegacyPositionL(ByteBuf to, Vector3d position) {
|
||||
to.writeLong((((int) position.getX() & 0x3FFFFFFL) << 38) | (((int) position.getY() & 0xFFFL) << 26) | ((int) position.getZ() & 0x3FFFFFFL));
|
||||
}
|
||||
|
||||
public static void writePEPosition(ByteBuf to, Vector3d position) {
|
||||
writeSVarInt(to, (int) position.getX());
|
||||
writeVarInt(to, (int) position.getY());
|
||||
writeSVarInt(to, (int) position.getZ());
|
||||
}
|
||||
|
||||
public static void writeLegacyPositionB(ByteBuf to, Vector3d position) {
|
||||
to.writeInt((int) position.getX());
|
||||
to.writeByte((int) position.getY());
|
||||
to.writeInt((int) position.getZ());
|
||||
}
|
||||
|
||||
public static void writeLegacyPositionS(ByteBuf to, Vector3d position) {
|
||||
to.writeInt((int) position.getX());
|
||||
to.writeShort((int) position.getY());
|
||||
to.writeInt((int) position.getZ());
|
||||
}
|
||||
|
||||
public static void writeLegacyPositionI(ByteBuf to, Vector3d position) {
|
||||
to.writeInt((int) position.getX());
|
||||
to.writeInt((int) position.getY());
|
||||
to.writeInt((int) position.getZ());
|
||||
}
|
||||
|
||||
public static Vector2i readIntChunkCoord(ByteBuf from) {
|
||||
return new Vector2i(from.readInt(), from.readInt());
|
||||
}
|
||||
|
||||
public static Vector2i readVarIntChunkCoord(ByteBuf from) {
|
||||
return new Vector2i(readVarInt(from), readVarInt(from));
|
||||
}
|
||||
|
||||
public static void writeIntChunkCoord(ByteBuf to, Vector2i chunk) {
|
||||
to.writeInt(chunk.getX());
|
||||
to.writeInt(chunk.getY());
|
||||
}
|
||||
|
||||
public static Vector2i readPEChunkCoord(ByteBuf from) {
|
||||
return new Vector2i(readSVarInt(from), readSVarInt(from));
|
||||
}
|
||||
|
||||
public static void writePEChunkCoord(ByteBuf to, Vector2i chunk) {
|
||||
writeSVarInt(to, chunk.getX());
|
||||
writeSVarInt(to, chunk.getY());
|
||||
}
|
||||
|
||||
public static int readLocalCoord(ByteBuf from) {
|
||||
return from.readUnsignedShort();
|
||||
}
|
||||
|
||||
public static void writeLocalCoord(ByteBuf to, int coord) {
|
||||
to.writeShort(coord);
|
||||
}
|
||||
|
||||
public static void writeVarIntChunkCoord(ByteBuf to, Vector2i chunk) {
|
||||
writeVarInt(to, chunk.getX());
|
||||
writeVarInt(to, chunk.getY());
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static final int MAX_LENGTH = 5;
|
||||
|
||||
|
||||
|
||||
public static void writeFixedSizeVarInt(ByteBuf to, int i) {
|
||||
|
||||
int writerIndex = to.writerIndex();
|
||||
|
||||
while ((i & 0xFFFFFF80) != 0x0) {
|
||||
|
||||
to.writeByte(i | 0x80);
|
||||
|
||||
i >>>= 7;
|
||||
|
||||
}
|
||||
|
||||
int paddingBytes = MAX_LENGTH - (to.writerIndex() - writerIndex) - 1;
|
||||
|
||||
if (paddingBytes == 0) {
|
||||
|
||||
to.writeByte(i);
|
||||
|
||||
} else {
|
||||
|
||||
to.writeByte(i | 0x80);
|
||||
|
||||
while (--paddingBytes > 0) {
|
||||
|
||||
to.writeByte(0x80);
|
||||
|
||||
}
|
||||
|
||||
to.writeByte(0);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static int readVarInt(ByteBuf from) {
|
||||
|
||||
int value = 0;
|
||||
|
||||
int length = 0;
|
||||
|
||||
byte part;
|
||||
|
||||
do {
|
||||
|
||||
part = from.readByte();
|
||||
|
||||
value |= (part & 0x7F) << (length++ * 7);
|
||||
|
||||
if (length > MAX_LENGTH) {
|
||||
|
||||
throw new DecoderException("VarInt too big");
|
||||
|
||||
}
|
||||
|
||||
} while (part < 0);
|
||||
|
||||
return value;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeVarInt(ByteBuf to, int i) {
|
||||
|
||||
while ((i & 0xFFFFFF80) != 0x0) {
|
||||
|
||||
to.writeByte(i | 0x80);
|
||||
|
||||
i >>>= 7;
|
||||
|
||||
}
|
||||
|
||||
to.writeByte(i);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static int readSVarInt(ByteBuf from) {
|
||||
|
||||
int varint = readVarInt(from);
|
||||
|
||||
return (varint >> 1) ^ -(varint & 1);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeSVarInt(ByteBuf to, int varint) {
|
||||
|
||||
writeVarInt(to, (varint << 1) ^ (varint >> 31));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static long readVarLong(ByteBuf from) {
|
||||
|
||||
long varlong = 0L;
|
||||
|
||||
int length = 0;
|
||||
|
||||
byte part;
|
||||
|
||||
do {
|
||||
|
||||
part = from.readByte();
|
||||
|
||||
varlong |= (part & 0x7F) << (length++ * 7);
|
||||
|
||||
if (length > 10) {
|
||||
|
||||
throw new RuntimeException("VarLong too big");
|
||||
|
||||
}
|
||||
|
||||
} while ((part & 0x80) == 0x80);
|
||||
|
||||
return varlong;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeVarLong(ByteBuf to, long varlong) {
|
||||
|
||||
while ((varlong & 0xFFFFFFFFFFFFFF80L) != 0x0L) {
|
||||
|
||||
to.writeByte((int) (varlong & 0x7FL) | 0x80);
|
||||
|
||||
varlong >>>= 7;
|
||||
|
||||
}
|
||||
|
||||
to.writeByte((int) varlong);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static long readSVarLong(ByteBuf from) {
|
||||
|
||||
long varlong = readVarLong(from);
|
||||
|
||||
return (varlong >> 1) ^ -(varlong & 1);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeSVarLong(ByteBuf to, long varlong) {
|
||||
|
||||
writeVarLong(to, (varlong << 1) ^ (varlong >> 63));
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static ByteBuf readShortByteArraySlice(ByteBuf from, int limit) {
|
||||
|
||||
int length = from.readShort();
|
||||
|
||||
checkLimit(length, limit);
|
||||
|
||||
return from.readSlice(length);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
public static <T> T[] readShortTArray(ByteBuf from, Class<T> tclass, Function<ByteBuf, T> elementReader) {
|
||||
|
||||
T[] array = (T[]) Array.newInstance(tclass, from.readShort());
|
||||
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
|
||||
array[i] = elementReader.apply(from);
|
||||
|
||||
}
|
||||
|
||||
return array;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static byte[] readVarIntByteArray(ByteBuf from) {
|
||||
|
||||
return readBytes(from, readVarInt(from));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static ByteBuf readVarIntByteArraySlice(ByteBuf from, int limit) {
|
||||
|
||||
int length = readVarInt(from);
|
||||
|
||||
checkLimit(length, limit);
|
||||
|
||||
return from.readSlice(length);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static ByteBuf readVarIntByteArraySlice(ByteBuf from) {
|
||||
|
||||
return from.readSlice(readVarInt(from));
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
public static <T> T[] readVarIntTArray(ByteBuf from, Class<T> tclass, Function<ByteBuf, T> elementReader) {
|
||||
|
||||
T[] array = (T[]) Array.newInstance(tclass, readVarInt(from));
|
||||
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
|
||||
array[i] = elementReader.apply(from);
|
||||
|
||||
}
|
||||
|
||||
return array;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static int[] readVarIntVarIntArray(ByteBuf from) {
|
||||
|
||||
int[] array = new int[readVarInt(from)];
|
||||
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
|
||||
array[i] = readVarInt(from);
|
||||
|
||||
}
|
||||
|
||||
return array;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static void writeShortByteArray(ByteBuf to, ByteBuf data) {
|
||||
|
||||
to.writeShort(data.readableBytes());
|
||||
|
||||
to.writeBytes(data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeShortByteArray(ByteBuf to, byte[] data) {
|
||||
|
||||
to.writeShort(data.length);
|
||||
|
||||
to.writeBytes(data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeShortByteArray(ByteBuf to, Consumer<ByteBuf> dataWriter) {
|
||||
|
||||
writeLengthPrefixedBytes(to, (lTo, length) -> lTo.writeShort(length), dataWriter);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static <T> void writeShortTArray(ByteBuf to, T[] array, BiConsumer<ByteBuf, T> elementWriter) {
|
||||
|
||||
to.writeShort(array.length);
|
||||
|
||||
for (T element : array) {
|
||||
|
||||
elementWriter.accept(to, element);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
public static void writeVarIntByteArray(ByteBuf to, ByteBuf data) {
|
||||
|
||||
writeVarInt(to, data.readableBytes());
|
||||
|
||||
to.writeBytes(data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeVarIntByteArray(ByteBuf to, byte[] data) {
|
||||
|
||||
writeVarInt(to, data.length);
|
||||
|
||||
to.writeBytes(data);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeVarIntByteArray(ByteBuf to, Consumer<ByteBuf> dataWriter) {
|
||||
|
||||
writeLengthPrefixedBytes(to, GeyserUtils::writeFixedSizeVarInt, dataWriter);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeVarIntTArray(ByteBuf to, ToIntFunction<ByteBuf> arrayWriter) {
|
||||
|
||||
writeSizePrefixedData(to, GeyserUtils::writeFixedSizeVarInt, arrayWriter);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static <T> void writeVarIntTArray(ByteBuf to, T[] array, BiConsumer<ByteBuf, T> elementWriter) {
|
||||
|
||||
writeVarInt(to, array.length);
|
||||
|
||||
for (T element : array) {
|
||||
|
||||
elementWriter.accept(to, element);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static <T> void writeVarIntTArray(ByteBuf to, List<T> array, BiConsumer<ByteBuf, T> elementWriter) {
|
||||
|
||||
writeVarInt(to, array.size());
|
||||
|
||||
for (T element : array) {
|
||||
|
||||
elementWriter.accept(to, element);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static void writeVarIntEnum(ByteBuf to, Enum<?> e) {
|
||||
|
||||
writeVarInt(to, e.ordinal());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeByteEnum(ByteBuf to, Enum<?> e) {
|
||||
|
||||
to.writeByte(e.ordinal());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static UUID readUUID(ByteBuf from) {
|
||||
|
||||
return new UUID(from.readLong(), from.readLong());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeUUID(ByteBuf to, UUID uuid) {
|
||||
|
||||
to.writeLong(uuid.getMostSignificantBits());
|
||||
|
||||
to.writeLong(uuid.getLeastSignificantBits());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writePEUUID(ByteBuf to, UUID uuid) {
|
||||
|
||||
to.writeLongLE(uuid.getMostSignificantBits());
|
||||
|
||||
to.writeLongLE(uuid.getLeastSignificantBits());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static byte[] readAllBytes(ByteBuf buf) {
|
||||
|
||||
return readBytes(buf, buf.readableBytes());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static ByteBuf readAllBytesSlice(ByteBuf from) {
|
||||
|
||||
return from.readSlice(from.readableBytes());
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static ByteBuf readAllBytesSlice(ByteBuf buf, int limit) {
|
||||
|
||||
checkLimit(buf.readableBytes(), limit);
|
||||
|
||||
return readAllBytesSlice(buf);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static byte[] readBytes(ByteBuf buf, int length) {
|
||||
|
||||
byte[] result = new byte[length];
|
||||
|
||||
buf.readBytes(result);
|
||||
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected static void checkLimit(int length, int limit) {
|
||||
|
||||
if (length > limit) {
|
||||
|
||||
throw new DecoderException(MessageFormat.format("Size {0} is bigger than allowed {1}", length, limit));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeLengthPrefixedBytes(ByteBuf to, ObjIntConsumer<ByteBuf> lengthWriter, Consumer<ByteBuf> dataWriter) {
|
||||
|
||||
int lengthWriterIndex = to.writerIndex();
|
||||
|
||||
lengthWriter.accept(to, 0);
|
||||
|
||||
int writerIndexDataStart = to.writerIndex();
|
||||
|
||||
dataWriter.accept(to);
|
||||
|
||||
int writerIndexDataEnd = to.writerIndex();
|
||||
|
||||
to.writerIndex(lengthWriterIndex);
|
||||
|
||||
lengthWriter.accept(to, writerIndexDataEnd - writerIndexDataStart);
|
||||
|
||||
to.writerIndex(writerIndexDataEnd);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void writeSizePrefixedData(ByteBuf to, ObjIntConsumer<ByteBuf> sizeWriter, ToIntFunction<ByteBuf> dataWriter) {
|
||||
|
||||
int sizeWriterIndex = to.writerIndex();
|
||||
|
||||
sizeWriter.accept(to, 0);
|
||||
|
||||
int size = dataWriter.applyAsInt(to);
|
||||
|
||||
int writerIndexDataEnd = to.writerIndex();
|
||||
|
||||
to.writerIndex(sizeWriterIndex);
|
||||
|
||||
sizeWriter.accept(to, size);
|
||||
|
||||
to.writerIndex(writerIndexDataEnd);
|
||||
|
||||
}
|
||||
|
||||
|
||||
private static int getAnvilIndex(int x, int y, int z) {
|
||||
|
||||
return (y << 8) + (z << 4) + x;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,48 +1,23 @@
|
|||
/*
|
||||
* Copyright (c) 2019 GeyserMC. http://geysermc.org
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
* @author GeyserMC
|
||||
* @link https://github.com/GeyserMC/Geyser
|
||||
*/
|
||||
|
||||
package org.geysermc.connector.utils;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nukkitx.network.VarInts;
|
||||
import com.nukkitx.protocol.bedrock.packet.StartGamePacket;
|
||||
import com.nukkitx.protocol.bedrock.v361.BedrockUtils;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
public class Toolbox {
|
||||
|
||||
static {
|
||||
|
||||
InputStream stream = Toolbox.class.getClassLoader().getResourceAsStream("cached_pallete.json");
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
List<LinkedHashMap<String, Object>> entries = new ArrayList<>();
|
||||
|
||||
ArrayList<LinkedHashMap<String, Object>> entries = new ArrayList<>();
|
||||
|
||||
try {
|
||||
entries = mapper.readValue(stream, ArrayList.class);
|
||||
|
|
@ -51,15 +26,61 @@ public class Toolbox {
|
|||
}
|
||||
|
||||
ByteBuf b = Unpooled.buffer();
|
||||
VarInts.writeInt(b, entries.size());
|
||||
|
||||
VarInts.writeUnsignedInt(b, entries.size());
|
||||
|
||||
for (Map<String, Object> e : entries) {
|
||||
BedrockUtils.writeString(b, (String) e.get("name"));
|
||||
b.writeShortLE((Integer) e.get("data"));
|
||||
b.writeShortLE((int) e.get("data"));
|
||||
b.writeShortLE((int) e.get("id"));
|
||||
}
|
||||
|
||||
CACHED_PALLETE = b;
|
||||
|
||||
|
||||
|
||||
|
||||
InputStream stream2 = Toolbox.class.getClassLoader().getResourceAsStream("items.json");
|
||||
if (stream2 == null) {
|
||||
throw new AssertionError("Items Table not found");
|
||||
}
|
||||
|
||||
ObjectMapper mapper2 = new ObjectMapper();
|
||||
|
||||
ArrayList<HashMap> s = new ArrayList<>();
|
||||
try {
|
||||
s = mapper2.readValue(stream2, ArrayList.class);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
ArrayList<StartGamePacket.ItemEntry> l = new ArrayList<>();
|
||||
|
||||
for(HashMap e : s) {
|
||||
l.add(new StartGamePacket.ItemEntry((String) e.get("name"), (short) ((int) e.get("id"))));
|
||||
}
|
||||
|
||||
ITEMS = l;
|
||||
|
||||
/*ByteBuf serializer;
|
||||
|
||||
serializer = Unpooled.buffer();
|
||||
serializer.writeShortLE(1);
|
||||
GeyserUtils.writeVarIntByteArray(serializer, (chunkdata) -> {
|
||||
GeyserUtils.writeEmptySubChunk(chunkdata);
|
||||
chunkdata.writeZero(512);
|
||||
chunkdata.writeZero(256);
|
||||
chunkdata.writeByte(0);
|
||||
});
|
||||
|
||||
EMPTY_CHUNK = GeyserUtils.readAllBytes(serializer);*/
|
||||
|
||||
}
|
||||
|
||||
public static final Collection<StartGamePacket.ItemEntry> ITEMS;
|
||||
|
||||
public static final ByteBuf CACHED_PALLETE;
|
||||
|
||||
//public static final byte[] EMPTY_CHUNK;
|
||||
|
||||
}
|
||||
|
|
@ -2234,6 +2234,86 @@
|
|||
"id": 64,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_door",
|
||||
"id": 64,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:ladder",
|
||||
"id": 65,
|
||||
|
|
@ -2674,6 +2754,86 @@
|
|||
"id": 71,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:iron_door",
|
||||
"id": 71,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:wooden_pressure_plate",
|
||||
"id": 72,
|
||||
|
|
@ -8259,6 +8419,86 @@
|
|||
"id": 193,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:spruce_door",
|
||||
"id": 193,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
|
|
@ -8339,6 +8579,86 @@
|
|||
"id": 194,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:birch_door",
|
||||
"id": 194,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
|
|
@ -8419,6 +8739,86 @@
|
|||
"id": 195,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:jungle_door",
|
||||
"id": 195,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
|
|
@ -8499,6 +8899,86 @@
|
|||
"id": 196,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:acacia_door",
|
||||
"id": 196,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
|
|
@ -8579,6 +9059,86 @@
|
|||
"id": 197,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:dark_oak_door",
|
||||
"id": 197,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:grass_path",
|
||||
"id": 198,
|
||||
|
|
@ -15504,6 +16064,86 @@
|
|||
"id": 461,
|
||||
"data": 15
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 16
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 17
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 18
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 19
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 20
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 21
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 22
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 23
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 24
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 25
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 26
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 27
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 28
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 29
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 30
|
||||
},
|
||||
{
|
||||
"name": "minecraft:bell",
|
||||
"id": 461,
|
||||
"data": 31
|
||||
},
|
||||
{
|
||||
"name": "minecraft:sweet_berry_bush",
|
||||
"id": 462,
|
||||
|
|
|
|||
2758
connector/src/main/resources/items.json
Normal file
2758
connector/src/main/resources/items.json
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue