Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-12-28 03:17:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1692 from KennyTV/20w13a

Browse Source 
20w13a
This commit is contained in:
Myles 2020-03-25 21:56:41 +00:00 committed by GitHub
commit 2d05d601a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 830 additions and 786 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_16Types.java
View File

@ -39,11 +39,11 @@ public class Entity1_16Types {
LLAMA_SPIT(40, ENTITY),
TNT(59, ENTITY),
SHULKER_BULLET(64, ENTITY),
FISHING_BOBBER(102, ENTITY),
FISHING_BOBBER(105, ENTITY),
LIVINGENTITY(-1, ENTITY),
ARMOR_STAND(1, LIVINGENTITY),
PLAYER(101, LIVINGENTITY),
PLAYER(104, LIVINGENTITY),
ABSTRACT_INSENTIENT(-1, LIVINGENTITY),
ENDER_DRAGON(19, ABSTRACT_INSENTIENT),
@ -116,7 +116,8 @@ public class Entity1_16Types {
RAVAGER(99, ABSTRACT_MONSTER),
PIGLIN(101, ABSTRACT_MONSTER),
HOGLIN(100, ABSTRACT_INSENTIENT),
HOGLIN(100, ABSTRACT_ANIMAL),
STRIDER(102, ABSTRACT_ANIMAL),
// Illagers
ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER),
@ -169,7 +170,7 @@ public class Entity1_16Types {
PAINTING(52, ABSTRACT_HANGING),
ABSTRACT_LIGHTNING(-1, ENTITY),
LIGHTNING_BOLT(100, ABSTRACT_LIGHTNING),
LIGHTNING_BOLT(103, ABSTRACT_LIGHTNING),
// Arrows
ABSTRACT_ARROW(-1, ENTITY),

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

@ -80,7 +80,7 @@ public class ProtocolVersion {
register(v1_15 = new ProtocolVersion(573, "1.15"));
register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
register(v1_16 = new ProtocolVersion(707, "1.16"));
register(v1_16 = new ProtocolVersion(708, "1.16"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

14
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
View File

@ -4,6 +4,7 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
import us.myles.ViaVersion.api.protocol.Protocol;
@ -53,7 +54,10 @@ public class WorldPackets {
if (chunk.getBlockEntities() == null) return;
for (CompoundTag blockEntity : chunk.getBlockEntities()) {
String id = ((StringTag) blockEntity.get("id")).getValue();
StringTag idTag = blockEntity.get("id");
if (idTag == null) continue;
String id = idTag.getValue();
if (id.equals("minecraft:conduit")) {
StringTag targetUuidTag = blockEntity.remove("target_uuid");
if (targetUuidTag == null) continue;
@ -88,6 +92,14 @@ public class WorldPackets {
// Spawn Particle
blockRewriter.registerSpawnParticle(Type.DOUBLE, 0x24, 0x24, 3, 23, 32,
WorldPackets::getNewParticleId, InventoryPackets::toClient, Type.FLAT_VAR_INT_ITEM);
// Jigsaw
protocol.registerIncoming(State.PLAY, 0x27, 0x27, new PacketRemapper() {
@Override
public void registerMap() {
handler(PacketWrapper::cancel); //TODO possible to translate?
}
});
}
public static int getNewParticleId(int id) {

1583
common/src/main/resources/assets/viaversion/data/mapping-1.16.json
View File

File diff suppressed because it is too large Load Diff

8
common/src/main/resources/assets/viaversion/data/mappingdiff-1.15to1.16.json
View File

@ -904,6 +904,12 @@
"11095": "minecraft:diorite_wall[east=none,north=none,south=none,up=false,waterlogged=true,west=tall]",
"11096": "minecraft:diorite_wall[east=none,north=none,south=none,up=false,waterlogged=true,west=none]",
"11097": "minecraft:diorite_wall[east=none,north=none,south=none,up=false,waterlogged=false,west=tall]",
"11098": "minecraft:diorite_wall[east=none,north=none,south=none,up=false,waterlogged=false,west=none]"
"11098": "minecraft:diorite_wall[east=none,north=none,south=none,up=false,waterlogged=false,west=none]",
"11272": "minecraft:jigsaw[orientation=north_up]",
"11273": "minecraft:jigsaw[orientation=east_up]",
"11274": "minecraft:jigsaw[orientation=south_up]",
"11275": "minecraft:jigsaw[orientation=west_up]",
"11276": "minecraft:jigsaw[orientation=up_east]",
"11277": "minecraft:jigsaw[orientation=down_east]"
}
}