Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

19w13a

This commit is contained in:
Gerrygames 2019-03-27 19:08:53 +01:00
parent 4ca25df410
commit 65f60098c8
14 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
bungee/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
View File

@ -67,7 +67,7 @@ public class ProtocolVersion {
register(v1_13 = new ProtocolVersion(393, "1.13"));
register(v1_13_1 = new ProtocolVersion(401, "1.13.1"));
register(v1_13_2 = new ProtocolVersion(404, "1.13.2"));
register(v1_14 = new ProtocolVersion(467, "1.14"));
register(v1_14 = new ProtocolVersion(468, "1.14"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

7
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java
View File

@ -120,6 +120,13 @@ public class MetadataRewriter {
metadatas.remove(metadata); // TODO "Has target (aggressive state)", maybe moved to pos / entity status
}
}
// TODO Are witch and ravager also abstract illagers? They all inherit the new metadata 14 added in 19w13a
if (type.is(Entity1_14Types.EntityType.WITCH) || type.is(Entity1_14Types.EntityType.RAVAGER) || type.isOrHasParent(Entity1_14Types.EntityType.ABSTRACT_ILLAGER_BASE)) {
if (metadata.getId() >= 14) { // TODO 19w13 added a new boolean with id 14
metadata.setId(metadata.getId() + 1);
}
}
} catch (Exception e) {
metadatas.remove(metadata);
if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) {

12
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
View File

@ -177,7 +177,7 @@ public class Protocol1_14To1_13_2 extends Protocol {
}
});
registerIncoming(State.PLAY, -1, 0x02); //Unknown packet added in 19w11a
registerIncoming(State.PLAY, -1, 0x02); //Set Difficulty packet added in 19w11a
registerIncoming(State.PLAY, 0x02, 0x03);
registerIncoming(State.PLAY, 0x03, 0x04);
registerIncoming(State.PLAY, 0x04, 0x05);
@ -190,7 +190,7 @@ public class Protocol1_14To1_13_2 extends Protocol {
registerIncoming(State.PLAY, 0x0C, 0x0D);
registerIncoming(State.PLAY, 0x0D, 0x0E);
registerIncoming(State.PLAY, -1, 0x0F); //Unknown packet added in 19w11a
registerIncoming(State.PLAY, -1, 0x0F); //Lock Difficulty packet added in 19w11a
registerIncoming(State.PLAY, 0x0E, 0x10);
registerIncoming(State.PLAY, 0x0F, 0x11);
registerIncoming(State.PLAY, 0x10, 0x12);
@ -214,10 +214,12 @@ public class Protocol1_14To1_13_2 extends Protocol {
registerIncoming(State.PLAY, 0x23, 0x25);
registerIncoming(State.PLAY, 0x27, 0x29);
registerIncoming(State.PLAY, 0x28, 0x2A);
registerIncoming(State.PLAY, -1, 0x27); //Unknown packet added in 19w13a
registerIncoming(State.PLAY, 0x2A, 0x2C);
registerIncoming(State.PLAY, 0x27, 0x2A);
registerIncoming(State.PLAY, 0x28, 0x2B);
registerIncoming(State.PLAY, 0x2A, 0x2D);
}
public static int getNewSoundId(int id) {

8
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
View File

@ -18,7 +18,7 @@ public class PlayerPackets {
public static void register(Protocol protocol) {
// Open Sign Editor
protocol.registerOutgoing(State.PLAY, 0x2C, 0x2D, new PacketRemapper() {
protocol.registerOutgoing(State.PLAY, 0x2C, 0x2E, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.POSITION, Type.POSITION1_14);
@ -110,7 +110,7 @@ public class PlayerPackets {
});
// Update Structure Block
protocol.registerIncoming(State.PLAY, 0x25, 0x27, new PacketRemapper() {
protocol.registerIncoming(State.PLAY, 0x25, 0x28, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.POSITION1_14, Type.POSITION);
@ -118,7 +118,7 @@ public class PlayerPackets {
});
// Update Sign
protocol.registerIncoming(State.PLAY, 0x26, 0x28, new PacketRemapper() {
protocol.registerIncoming(State.PLAY, 0x26, 0x29, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.POSITION1_14, Type.POSITION);
@ -126,7 +126,7 @@ public class PlayerPackets {
});
// Player Block Placement
protocol.registerIncoming(State.PLAY, 0x29, 0x2B, new PacketRemapper() {
protocol.registerIncoming(State.PLAY, 0x29, 0x2C, new PacketRemapper() {
@Override
public void registerMap() {
handler(new PacketHandler() {

5
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
View File

@ -299,6 +299,11 @@ public class WorldPackets {
difficultyPacket.write(Type.UNSIGNED_BYTE, difficulty);
difficultyPacket.write(Type.BOOLEAN, false); // Unknown value added in 19w11a
difficultyPacket.send(protocol.getClass());
wrapper.passthrough(Type.UNSIGNED_BYTE); // Max Players
wrapper.passthrough(Type.STRING); // Level Type
wrapper.write(Type.VAR_INT, 0); // Added in 19w13a, maybe difficulty?
}
});
}

6
common/src/main/resources/assets/viaversion/data/mapping-1.14.json
View File

@ -12354,6 +12354,7 @@
"block.end_portal.spawn",
"entity.evoker.ambient",
"entity.evoker.cast_spell",
"entity.evoker.celebrate",
"entity.evoker.death",
"entity.evoker_fangs.attack",
"entity.evoker.hurt",
@ -12466,6 +12467,7 @@
"entity.husk.step",
"entity.ravager.ambient",
"entity.ravager.attack",
"entity.ravager.celebrate",
"entity.ravager.death",
"entity.ravager.hurt",
"entity.ravager.step",
@ -12636,6 +12638,7 @@
"entity.pig.saddle",
"entity.pig.step",
"entity.pillager.ambient",
"entity.pillager.celebrate",
"entity.pillager.death",
"entity.pillager.hurt",
"block.piston.contract",
@ -12845,6 +12848,7 @@
"entity.vex.death",
"entity.vex.hurt",
"entity.villager.ambient",
"entity.villager.celebrate",
"entity.villager.death",
"entity.villager.hurt",
"entity.villager.no",
@ -12864,6 +12868,7 @@
"entity.villager.work_toolsmith",
"entity.villager.work_weaponsmith",
"entity.vindicator.ambient",
"entity.vindicator.celebrate",
"entity.vindicator.death",
"entity.vindicator.hurt",
"block.lily_pad.place",
@ -12881,6 +12886,7 @@
"weather.rain",
"weather.rain.above",
"entity.witch.ambient",
"entity.witch.celebrate",
"entity.witch.death",
"entity.witch.drink",
"entity.witch.hurt",

2
jar/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>viaversion-jar</name>

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>us.myles</groupId>
<artifactId>viaversion-parent</artifactId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
<packaging>pom</packaging>
<name>viaversion-parent</name>

2
sponge-legacy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
sponge/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
velocity/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>viaversion-parent</artifactId>
<groupId>us.myles</groupId>
<version>2.0.0-19w12b</version>
<version>2.0.0-19w13a</version>
</parent>
<modelVersion>4.0.0</modelVersion>