Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-01 13:01:32 +01:00
Code Issues Projects Releases Wiki Activity

Added all missing metadata (except Particle)

Browse Source
This commit is contained in:
themode 2021-02-02 21:13:31 +01:00
parent cb41b2e3d7
commit c6cafb19a4
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main/java/net/minestom/server/entity/Metadata.java
View File

@ -10,6 +10,7 @@ import net.minestom.server.utils.binary.BinaryWriter;
import net.minestom.server.utils.binary.Writeable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jglrxavpok.hephaistos.nbt.NBT;
import java.util.Collection;
import java.util.Collections;
@ -43,9 +44,12 @@ public class Metadata {
}
public static Value<JsonMessage> OptChat(@Nullable JsonMessage value) {
return new OptionalValue<>(TYPE_OPTCHAT, value, writer -> {
assert value != null;
writer.writeSizedString(value.toString());
return new Value<>(TYPE_OPTCHAT, value, writer -> {
final boolean present = value != null;
writer.writeBoolean(present);
if (present) {
writer.writeSizedString(value.toString());
}
});
}
@ -70,9 +74,12 @@ public class Metadata {
}
public static Value<BlockPosition> OptPosition(@Nullable BlockPosition value) {
return new OptionalValue<>(TYPE_OPTPOSITION, value, writer -> {
assert value != null;
writer.writeBlockPosition(value);
return new Value<>(TYPE_OPTPOSITION, value, writer -> {
final boolean present = value != null;
writer.writeBoolean(present);
if (present) {
writer.writeBlockPosition(value);
}
});
}
@ -81,9 +88,25 @@ public class Metadata {
}
public static Value<UUID> OptUUID(@Nullable UUID value) {
return new OptionalValue<>(TYPE_OPTUUID, value, writer -> {
assert value != null;
writer.writeUuid(value);
return new Value<>(TYPE_OPTUUID, value, writer -> {
final boolean present = value != null;
writer.writeBoolean(present);
if (present) {
writer.writeUuid(value);
}
});
}
public static Value<Integer> OptBlockID(@Nullable Integer value) {
return new Value<>(TYPE_OPTBLOCKID, value, writer -> {
final boolean present = value != null;
writer.writeVarInt(present ? value : 0);
});
}
public static Value<NBT> NBT(@NotNull NBT nbt) {
return new Value<>(TYPE_NBT, nbt, writer -> {
writer.writeNBT("", nbt);
});
}
@ -97,6 +120,13 @@ public class Metadata {
});
}
public static Value<Integer> OptVarInt(@Nullable Integer value) {
return new Value<>(TYPE_OPTVARINT, value, writer -> {
final boolean present = value != null;
writer.writeVarInt(present ? value + 1 : 0);
});
}
public static Value<Entity.Pose> Pose(@NotNull Entity.Pose value) {
return new Value<>(TYPE_POSE, value, writer -> writer.writeVarInt(value.ordinal()));
}
@ -206,7 +236,7 @@ public class Metadata {
}
}
private static class OptionalValue<T> extends Value<T> {
/*private static class OptionalValue<T> extends Value<T> {
private OptionalValue(int type, T value, @NotNull Consumer<BinaryWriter> valueWriter) {
super(type, value, valueWriter);
}
@ -221,6 +251,6 @@ public class Metadata {
this.valueWriter.accept(writer);
}
}
}
}*/
}