Skip to content

Commit 227d37b

Browse files
Update VV api usage
1 parent be5bb6e commit 227d37b

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

common/src/main/java/com/viaversion/viarewind/api/rewriter/VREntityRewriter.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_8;
2727
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
2828
import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
29-
import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
3029
import com.viaversion.viaversion.api.type.Types;
3130
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
3231

@@ -40,19 +39,6 @@ public VREntityRewriter(T protocol, EntityDataType displayType, EntityDataType d
4039
super(protocol, displayType, displayVisibilityType);
4140
}
4241

43-
protected void registerJoinGame1_8(final C packetType) {
44-
protocol.registerClientbound(packetType, new PacketHandlers() {
45-
@Override
46-
protected void register() {
47-
map(Types.INT); // Entity id
48-
map(Types.UNSIGNED_BYTE); // Game mode
49-
map(Types.BYTE); // Dimension
50-
handler(playerTrackerHandler());
51-
handler(getDimensionHandler());
52-
}
53-
});
54-
}
55-
5642
protected void removeEntities(final UserConnection connection, final int[] entities) {
5743
final EntityTrackerBase tracker = tracker(connection);
5844
for (int entityId : entities) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/EntityPacketRewriter1_9.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.LevitationStorage;
2727
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.PlayerPositionTracker;
2828
import com.viaversion.viaversion.api.minecraft.BlockPosition;
29+
import com.viaversion.viaversion.api.minecraft.ClientWorld;
2930
import com.viaversion.viaversion.api.minecraft.EulerAngle;
3031
import com.viaversion.viaversion.api.minecraft.Vector;
3132
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
@@ -60,9 +61,17 @@ public EntityPacketRewriter1_9(Protocol1_9To1_8 protocol) {
6061

6162
@Override
6263
protected void registerPackets() {
63-
registerJoinGame1_8(ClientboundPackets1_9.LOGIN);
6464
registerRemoveEntities(ClientboundPackets1_9.REMOVE_ENTITIES);
6565

66+
protocol.registerClientbound(ClientboundPackets1_9.LOGIN, wrapper -> {
67+
final int entityId = wrapper.passthrough(Types.INT);
68+
wrapper.passthrough(Types.UNSIGNED_BYTE); // Game mode
69+
final int dimension = wrapper.passthrough(Types.BYTE);
70+
71+
trackPlayer(wrapper.user(), entityId);
72+
final ClientWorld clientWorld = wrapper.user().getClientWorld(Protocol1_9To1_8.class);
73+
clientWorld.setEnvironment(dimension);
74+
});
6675
protocol.registerClientbound(ClientboundPackets1_9.SET_ENTITY_DATA, wrapper -> {
6776
final int entityId = wrapper.passthrough(Types.VAR_INT);
6877
if (!tracker(wrapper.user()).hasEntity(entityId)) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/PlayerPacketRewriter1_9.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
2222
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.*;
2323
import com.viaversion.viarewind.utils.ChatUtil;
24+
import com.viaversion.viaversion.api.data.entity.EntityTracker;
2425
import com.viaversion.viaversion.api.minecraft.BlockPosition;
2526
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9;
2627
import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -175,7 +176,8 @@ public void register() {
175176
final int dimension = wrapper.get(Types.INT, 0);
176177

177178
if (world.setEnvironment(dimension)) {
178-
protocol.getEntityRewriter().clearEntities(wrapper.user());
179+
final EntityTracker tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
180+
tracker.clearEntities();
179181
wrapper.user().get(BossBarStorage.class).reset();
180182
}
181183
});

0 commit comments

Comments
 (0)