Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 12:51:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to MC 1.10-pre1

Browse source
This commit is contained in:
Final Child 2016-06-06 21:56:48 +09:00
parent 242743539a
commit 0e05503348
6 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/spacehq/mc/protocol/MinecraftConstants.java
View file

@ -2,8 +2,8 @@ package org.spacehq.mc.protocol;
public class MinecraftConstants {
// General Constants
public static final String GAME_VERSION = "1.9.4";
public static final int PROTOCOL_VERSION = 110;
public static final String GAME_VERSION = "1.10-pre1";
public static final int PROTOCOL_VERSION = 204;
// General Key Constants
public static final String PROFILE_KEY = "profile";

2
src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
View file

@ -306,7 +306,6 @@ public class MagicValues {
register(GlobalEntityType.LIGHTNING_BOLT, 1);
register(MobType.ARMOR_STAND, 30);
register(MobType.MOB, 48);
register(MobType.MONSTER, 49);
register(MobType.CREEPER, 50);
@ -341,6 +340,7 @@ public class MagicValues {
register(MobType.IRON_GOLEM, 99);
register(MobType.HORSE, 100);
register(MobType.RABBIT, 101);
register(MobType.POLAR_BEAR, 102);
register(MobType.VILLAGER, 120);
register(ObjectType.BOAT, 1);

2
src/main/java/org/spacehq/mc/protocol/data/game/entity/type/MobType.java
View file

@ -1,7 +1,6 @@
package org.spacehq.mc.protocol.data.game.entity.type;
public enum MobType {
ARMOR_STAND,
MOB,
MONSTER,
CREEPER,
@ -36,5 +35,6 @@ public enum MobType {
IRON_GOLEM,
HORSE,
RABBIT,
POLAR_BEAR,
VILLAGER;
}

10
src/main/java/org/spacehq/mc/protocol/packet/ingame/client/ClientResourcePackStatusPacket.java
View file

@ -10,35 +10,27 @@ import org.spacehq.packetlib.packet.Packet;
import java.io.IOException;
public class ClientResourcePackStatusPacket implements Packet {
private String hash;
private ResourcePackStatus status;
@SuppressWarnings("unused")
private ClientResourcePackStatusPacket() {
}
public ClientResourcePackStatusPacket(String hash, ResourcePackStatus status) {
this.hash = hash;
public ClientResourcePackStatusPacket(ResourcePackStatus status) {
this.status = status;
}
public String getHash() {
return this.hash;
}
public ResourcePackStatus getStatus() {
return this.status;
}
@Override
public void read(NetInput in) throws IOException {
this.hash = in.readString();
this.status = MagicValues.key(ResourcePackStatus.class, in.readVarInt());
}
@Override
public void write(NetOutput out) throws IOException {
out.writeString(this.hash);
out.writeVarInt(MagicValues.value(Integer.class, this.status));
}

12
src/main/java/org/spacehq/mc/protocol/packet/ingame/server/world/ServerPlayBuiltinSoundPacket.java
View file

@ -70,7 +70,6 @@ public class ServerPlayBuiltinSoundPacket implements Packet {
this.y = in.readInt() / 8D;
this.z = in.readInt() / 8D;
this.volume = in.readFloat();
this.pitch = in.readUnsignedByte() / 63.5f;
}
@Override
@ -81,16 +80,7 @@ public class ServerPlayBuiltinSoundPacket implements Packet {
out.writeInt((int) (this.y * 8));
out.writeInt((int) (this.z * 8));
out.writeFloat(this.volume);
int pitch = (int) (this.pitch * 63.5f);
if(pitch > 255) {
pitch = 255;
}
if(pitch < 0) {
pitch = 0;
}
out.writeByte(pitch);
out.writeFloat(this.pitch);
}
@Override

15
src/main/java/org/spacehq/mc/protocol/packet/ingame/server/world/ServerPlaySoundPacket.java
View file

@ -78,7 +78,7 @@ public class ServerPlaySoundPacket implements Packet {
this.y = in.readInt() / 8D;
this.z = in.readInt() / 8D;
this.volume = in.readFloat();
this.pitch = in.readUnsignedByte() / 63f;
this.pitch = in.readFloat();
}
@Override
@ -87,7 +87,7 @@ public class ServerPlaySoundPacket implements Packet {
if(this.sound instanceof CustomSound) {
value = ((CustomSound) this.sound).getName();
} else if(this.sound instanceof BuiltinSound) {
value = MagicValues.value(String.class, (BuiltinSound) this.sound);
value = MagicValues.value(String.class, this.sound);
}
out.writeString(value);
@ -96,16 +96,7 @@ public class ServerPlaySoundPacket implements Packet {
out.writeInt((int) (this.y * 8));
out.writeInt((int) (this.z * 8));
out.writeFloat(this.volume);
int pitch = (int) (this.pitch * 63);
if(pitch > 255) {
pitch = 255;
}
if(pitch < 0) {
pitch = 0;
}
out.writeByte(pitch);
out.writeFloat(this.pitch);
}
@Override