AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-09 07:20:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

update todo, add all items

Browse Source
This commit is contained in:
bixilon 2020-06-09 00:19:12 +02:00
parent ffbff15ca8
commit 56a8d5c3f1
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
12 changed files with 1058 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/bixilon/minosoft/game/datatypes/Slot.java
View File

@ -13,11 +13,13 @@
package de.bixilon.minosoft.game.datatypes;
import de.bixilon.minosoft.game.datatypes.entities.Items;
import de.bixilon.minosoft.nbt.tag.CompoundTag;
public class Slot {
int itemId;
int itemCount;
short itemMetadata;
CompoundTag nbt;
public Slot(int itemId, int itemCount, CompoundTag nbt) {
@ -26,8 +28,9 @@ public class Slot {
this.nbt = nbt;
}
public Slot(short itemId, byte itemCount, short itemDamage, CompoundTag nbt) {
public Slot(short itemId, byte itemCount, short itemMetadata, CompoundTag nbt) {
this.itemId = itemId;
this.itemMetadata = itemMetadata;
this.itemCount = itemCount;
this.nbt = nbt;
}
@ -40,14 +43,19 @@ public class Slot {
return itemCount;
}
public short getItemMetadata() {
return itemMetadata;
}
public CompoundTag getNbt() {
return nbt;
}
public String getDisplayName() {
String itemName = Items.byLegacy(getItemId(), getItemMetadata()).name();
if (nbt != null && nbt.containsKey("display") && nbt.getCompoundTag("display").containsKey("Name")) { // check if object has nbt data, and a custom display name
return new TextComponent(nbt.getCompoundTag("display").getStringTag("Name").getValue()).getColoredMessage();
return String.format("%s (%s)", new TextComponent(nbt.getCompoundTag("display").getStringTag("Name").getValue()).getColoredMessage(), itemName);
}
return "<ToDo>"; //ToDo display name per Item
return itemName; //ToDo display name per Item
}
}

1040
src/main/java/de/bixilon/minosoft/game/datatypes/entities/Items.java Normal file
View File

File diff suppressed because it is too large Load Diff

1
src/main/java/de/bixilon/minosoft/game/datatypes/entities/meta/AgeableMetaData.java
View File

@ -24,7 +24,6 @@ public class AgeableMetaData extends MobMetaData {
public int getAge() {
//ToDo custom Potion Effect Color Type
switch (version) {
case VERSION_1_7_10:
return (int) sets.get(12).getData();

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketEncryptionKeyRequest.java
View File

@ -32,7 +32,7 @@ public class PacketEncryptionKeyRequest implements ClientboundPacket {
publicKey = buffer.readBytes(buffer.readShort()); // read length, then the bytes
verifyToken = buffer.readBytes(buffer.readShort()); // read length, then the bytes
break;
} // ToDo
}
}
@Override

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEquipment.java
View File

@ -41,7 +41,7 @@ public class PacketEntityEquipment implements ClientboundPacket {
@Override
public void log() {
if (data != null) {
Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): %s", entityId, slot.name(), data.getDisplayName()));
Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): %dx %s", entityId, slot.name(), data.getItemCount(), data.getDisplayName()));
} else {
// null means nothing, means air
Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): AIR", entityId, slot.name()));

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityHeadRotation.java
View File

@ -29,7 +29,7 @@ public class PacketEntityHeadRotation implements ClientboundPacket {
switch (v) {
case VERSION_1_7_10:
this.entityId = buffer.readInteger();
this.headYaw = buffer.readByte(); //ToDo
this.headYaw = buffer.readByte();
break;
}
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityPositionAndRotation.java
View File

@ -33,7 +33,7 @@ public class PacketEntityPositionAndRotation implements ClientboundPacket {
case VERSION_1_7_10:
this.entityId = buffer.readInteger();
this.location = new RelativeLocation(buffer.readFixedPointNumberByte(), buffer.readFixedPointNumberByte(), buffer.readFixedPointNumberByte());
this.yaw = buffer.readByte(); //ToDo
this.yaw = buffer.readByte(); //ToDo dividing, ...
this.pitch = buffer.readByte();
break;
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityRotation.java
View File

@ -30,7 +30,7 @@ public class PacketEntityRotation implements ClientboundPacket {
switch (v) {
case VERSION_1_7_10:
this.entityId = buffer.readInteger();
this.yaw = buffer.readByte(); //ToDo
this.yaw = buffer.readByte();
this.pitch = buffer.readByte();
break;
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityTeleport.java
View File

@ -33,7 +33,7 @@ public class PacketEntityTeleport implements ClientboundPacket {
case VERSION_1_7_10:
this.entityId = buffer.readInteger();
this.location = new Location(buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger());
this.yaw = buffer.readByte(); //ToDo
this.yaw = buffer.readByte();
this.pitch = buffer.readByte();
break;
}

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnMob.java
View File

@ -36,7 +36,7 @@ public class PacketSpawnMob implements ClientboundPacket {
int entityId = buffer.readVarInt();
Mobs type = Mobs.byType(buffer.readByte());
Location location = new Location(buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger(), buffer.readFixedPointNumberInteger());
int yaw = buffer.readByte(); //ToDo
int yaw = buffer.readByte();
int pitch = buffer.readByte();
int headPitch = buffer.readByte();
Velocity velocity = new Velocity(buffer.readShort(), buffer.readShort(), buffer.readShort());

1
src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.java
View File

@ -112,7 +112,6 @@ public class InByteBuffer {
public String readString() {
int length = readVarInt();
if (length > ProtocolDefinition.STRING_MAX_LEN) {
// ToDo throw new PacketDataException(String.format("String is longer than %s", ProtocolDefinition.STRING_MAX_LEN));
return null;
}
return new String(readBytes(length), StandardCharsets.UTF_8);

1
src/main/java/de/bixilon/minosoft/protocol/protocol/OutByteBuffer.java
View File

@ -89,7 +89,6 @@ public class OutByteBuffer {
public void writeString(String s) {
if (s.length() > ProtocolDefinition.STRING_MAX_LEN) {
//ToDo
writeByte((byte) 0); // write length 0
}
writeVarInt(s.length());