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

Reuse 1.15, 1.16 and 1.16.2 chunk types as well

This commit is contained in:
Nassim Jahnke 2023-10-20 12:43:46 +10:00
parent 84a054aac1
commit 7edde72416
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
10 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_15.java
View File

@ -35,6 +35,7 @@ import java.util.Arrays;
import java.util.List;
public class ChunkType1_15 extends Type<Chunk> {
public static final Type<Chunk> TYPE = new ChunkType1_15();
private static final CompoundTag[] EMPTY_COMPOUNDS = new CompoundTag[0];
public ChunkType1_15() {

1
api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16.java
View File

@ -35,6 +35,7 @@ import java.util.Arrays;
import java.util.List;
public class ChunkType1_16 extends Type<Chunk> {
public static final Type<Chunk> TYPE = new ChunkType1_16();
private static final CompoundTag[] EMPTY_COMPOUNDS = new CompoundTag[0];
public ChunkType1_16() {

1
api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkType1_16_2.java
View File

@ -35,6 +35,7 @@ import java.util.Arrays;
import java.util.List;
public class ChunkType1_16_2 extends Type<Chunk> {
public static final Type<Chunk> TYPE = new ChunkType1_16_2();
private static final CompoundTag[] EMPTY_COMPOUNDS = new CompoundTag[0];
public ChunkType1_16_2() {

2
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/packets/WorldPackets.java
View File

@ -41,7 +41,7 @@ public final class WorldPackets {
protocol.registerClientbound(ClientboundPackets1_14_4.CHUNK_DATA, wrapper -> {
Chunk chunk = wrapper.read(ChunkType1_14.TYPE);
wrapper.write(new ChunkType1_15(), chunk);
wrapper.write(ChunkType1_15.TYPE, chunk);
if (chunk.isFullChunk()) {
int[] biomeData = chunk.getBiomeData();

4
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/packets/WorldPackets.java
View File

@ -46,8 +46,8 @@ public class WorldPackets {
blockRewriter.registerAcknowledgePlayerDigging(ClientboundPackets1_16.ACKNOWLEDGE_PLAYER_DIGGING);
protocol.registerClientbound(ClientboundPackets1_16.CHUNK_DATA, wrapper -> {
Chunk chunk = wrapper.read(new ChunkType1_16());
wrapper.write(new ChunkType1_16_2(), chunk);
Chunk chunk = wrapper.read(ChunkType1_16.TYPE);
wrapper.write(ChunkType1_16_2.TYPE, chunk);
for (int s = 0; s < chunk.getSections().length; s++) {
ChunkSection section = chunk.getSections()[s];

4
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/WorldPackets.java
View File

@ -59,8 +59,8 @@ public class WorldPackets {
});
protocol.registerClientbound(ClientboundPackets1_15.CHUNK_DATA, wrapper -> {
Chunk chunk = wrapper.read(new ChunkType1_15());
wrapper.write(new ChunkType1_16(), chunk);
Chunk chunk = wrapper.read(ChunkType1_15.TYPE);
wrapper.write(ChunkType1_16.TYPE, chunk);
chunk.setIgnoreOldLightData(chunk.isFullChunk());

2
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/WorldPackets.java
View File

@ -122,7 +122,7 @@ public final class WorldPackets {
});
protocol.registerClientbound(ClientboundPackets1_16_2.CHUNK_DATA, wrapper -> {
Chunk chunk = wrapper.read(new ChunkType1_16_2());
Chunk chunk = wrapper.read(ChunkType1_16_2.TYPE);
if (!chunk.isFullChunk()) {
// All chunks are full chunk packets now (1.16 already stopped sending non-full chunks)
// Construct multi block change packets instead

2
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/Protocol1_19_4To1_19_3.java
View File

@ -110,7 +110,7 @@ public final class Protocol1_19_4To1_19_3 extends AbstractProtocol<ClientboundPa
public void init(final UserConnection user) {
addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19_4.PLAYER));
user.put(new PlayerVehicleTracker(user));
user.put(new PlayerVehicleTracker());
}
@Override

2
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java
View File

@ -179,7 +179,7 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
map(Type.STRING); // Dimension
map(Type.STRING); // World
handler(worldDataTrackerHandlerByKey());
handler(wrapper -> wrapper.user().put(new PlayerVehicleTracker(wrapper.user())));
handler(wrapper -> wrapper.user().put(new PlayerVehicleTracker()));
}
});

10
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/storage/PlayerVehicleTracker.java
View File

@ -17,17 +17,12 @@
*/
package com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.storage;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.connection.StorableObject;
public class PlayerVehicleTracker extends StoredObject {
public class PlayerVehicleTracker implements StorableObject {
private int vehicleId = -1;
public PlayerVehicleTracker(final UserConnection user) {
super(user);
}
public int getVehicleId() {
return this.vehicleId;
}
@ -35,5 +30,4 @@ public class PlayerVehicleTracker extends StoredObject {
public void setVehicleId(final int vehicleId) {
this.vehicleId = vehicleId;
}
}