Skip to content

Commit b1d6804

Browse files
kennytvkennytv
committed
Update VV API usage
1 parent 64c18af commit b1d6804

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎common/src/main/java/com/viaversion/viarewind/api/type/PositionVarYType.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@
1717
*/
1818
package com.viaversion.viarewind.api.type;
1919

20-
import com.viaversion.viaversion.api.minecraft.Position;
20+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
2121
import com.viaversion.viaversion.api.type.Type;
2222
import io.netty.buffer.ByteBuf;
2323

2424
import java.util.function.IntFunction;
2525

26-
public class PositionVarYType<T extends Number> extends Type<Position> {
26+
public class PositionVarYType<T extends Number> extends Type<BlockPosition> {
2727

2828
private final Type<T> yType;
2929
private final IntFunction<T> toY;
3030

3131
public PositionVarYType(final Type<T> yType, final IntFunction<T> toY) {
32-
super(Position.class);
32+
super(BlockPosition.class);
3333

3434
this.yType = yType;
3535
this.toY = toY;
3636
}
3737

3838
@Override
39-
public Position read(ByteBuf buffer) {
39+
public BlockPosition read(ByteBuf buffer) {
4040
final int x = buffer.readInt();
4141
final int y = yType.read(buffer).intValue();
4242
final int z = buffer.readInt();
4343

44-
return new Position(x, y, z);
44+
return new BlockPosition(x, y, z);
4545
}
4646

4747
@Override
48-
public void write(ByteBuf buffer, Position value) {
48+
public void write(ByteBuf buffer, BlockPosition value) {
4949
buffer.writeInt(value.x());
5050
yType.write(buffer, this.toY.apply(value.y()));
5151
buffer.writeInt(value.z());

‎common/src/main/java/com/viaversion/viarewind/api/type/RewindTypes.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.viaversion.viarewind.api.type.item.ItemType;
2323
import com.viaversion.viarewind.api.type.entitydata.EntityDataListType;
2424
import com.viaversion.viarewind.api.type.entitydata.EntityDataType;
25-
import com.viaversion.viaversion.api.minecraft.Position;
25+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
2626
import com.viaversion.viaversion.api.minecraft.item.Item;
2727
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
2828
import com.viaversion.viaversion.api.type.Type;
@@ -35,10 +35,10 @@ public class RewindTypes {
3535

3636
public static final Type<int[]> INT_ARRAY = new IntArrayType(); // Integer array with byte as length indicator
3737

38-
public static final Type<Position> SHORT_POSITION = new PositionVarYType<>(Types.SHORT, value -> (short) value);
39-
public static final Type<Position> INT_POSITION = new PositionVarYType<>(Types.INT, value -> value);
40-
public static final Type<Position> BYTE_POSITION = new PositionVarYType<>(Types.BYTE, value -> (byte) value);
41-
public static final Type<Position> U_BYTE_POSITION = new PositionVarYType<>(Types.UNSIGNED_BYTE, value -> (short) value);
38+
public static final Type<BlockPosition> SHORT_POSITION = new PositionVarYType<>(Types.SHORT, value -> (short) value);
39+
public static final Type<BlockPosition> INT_POSITION = new PositionVarYType<>(Types.INT, value -> value);
40+
public static final Type<BlockPosition> BYTE_POSITION = new PositionVarYType<>(Types.BYTE, value -> (byte) value);
41+
public static final Type<BlockPosition> U_BYTE_POSITION = new PositionVarYType<>(Types.UNSIGNED_BYTE, value -> (short) value);
4242

4343
public static final Type<CompoundTag> COMPRESSED_NBT = new NBTType();
4444
public static final Type<Item> COMPRESSED_NBT_ITEM = new ItemType();

‎common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/EntityPacketRewriter1_8.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.PlayerSessionStorage;
3434
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.ScoreboardTracker;
3535
import com.viaversion.viaversion.api.Via;
36+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
3637
import com.viaversion.viaversion.api.minecraft.ClientWorld;
37-
import com.viaversion.viaversion.api.minecraft.Position;
3838
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
3939
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8.EntityType;
4040
import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -211,7 +211,7 @@ public void register() {
211211
map(Types.UNSIGNED_BYTE, Types.INT); // Rotation
212212
handler(wrapper -> {
213213
final int entityId = wrapper.get(Types.VAR_INT, 0);
214-
final Position position = wrapper.get(RewindTypes.INT_POSITION, 0);
214+
final BlockPosition position = wrapper.get(RewindTypes.INT_POSITION, 0);
215215
final int rotation = wrapper.get(Types.INT, 0);
216216
int modX = 0;
217217
int modZ = 0;
@@ -229,7 +229,7 @@ public void register() {
229229
modX = -1;
230230
break;
231231
}
232-
wrapper.set(RewindTypes.INT_POSITION, 0, new Position(position.x() + modX, position.y(), position.z() + modZ));
232+
wrapper.set(RewindTypes.INT_POSITION, 0, new BlockPosition(position.x() + modX, position.y(), position.z() + modZ));
233233
addTrackedEntity(wrapper, entityId, EntityTypes1_8.EntityType.PAINTING);
234234
});
235235
}

‎common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/PlayerPacketRewriter1_8.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import com.viaversion.viarewind.api.minecraft.math.RayTracing;
3131
import com.viaversion.viarewind.api.minecraft.math.Vector3d;
3232
import com.viaversion.viaversion.api.Via;
33+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
3334
import com.viaversion.viaversion.api.minecraft.Environment;
34-
import com.viaversion.viaversion.api.minecraft.Position;
3535
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
3636
import com.viaversion.viaversion.api.minecraft.item.Item;
3737
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -629,7 +629,7 @@ public void register() {
629629
int x = wrapper.read(Types.INT);
630630
int y = wrapper.read(Types.UNSIGNED_BYTE);
631631
int z = wrapper.read(Types.INT);
632-
wrapper.write(Types.BLOCK_POSITION1_8, new Position(x, y, z));
632+
wrapper.write(Types.BLOCK_POSITION1_8, new BlockPosition(x, y, z));
633633
});
634634
}
635635
});
@@ -641,7 +641,7 @@ public void register() {
641641
int x = wrapper.read(Types.INT);
642642
int y = wrapper.read(Types.UNSIGNED_BYTE);
643643
int z = wrapper.read(Types.INT);
644-
wrapper.write(Types.BLOCK_POSITION1_8, new Position(x, y, z));
644+
wrapper.write(Types.BLOCK_POSITION1_8, new BlockPosition(x, y, z));
645645

646646
wrapper.passthrough(Types.BYTE); //Direction
647647
Item item = wrapper.read(RewindTypes.COMPRESSED_NBT_ITEM);
@@ -747,7 +747,7 @@ public void register() {
747747
int x = wrapper.read(Types.INT);
748748
int y = wrapper.read(Types.SHORT);
749749
int z = wrapper.read(Types.INT);
750-
wrapper.write(Types.BLOCK_POSITION1_8, new Position(x, y, z));
750+
wrapper.write(Types.BLOCK_POSITION1_8, new BlockPosition(x, y, z));
751751
for (int i = 0; i < 4; i++) {
752752
final String line = wrapper.read(Types.STRING);
753753

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.LevitationStorage;
2828
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.PlayerPositionTracker;
2929
import com.viaversion.viaversion.api.Via;
30+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
3031
import com.viaversion.viaversion.api.minecraft.EulerAngle;
31-
import com.viaversion.viaversion.api.minecraft.Position;
3232
import com.viaversion.viaversion.api.minecraft.Vector;
3333
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9;
3434
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9.EntityType;
@@ -611,7 +611,7 @@ private void handleEntityData(EntityDataHandlerEvent event, EntityData metadata)
611611
metadata.setValue(protocol.getItemRewriter().handleItemToClient(event.user(), (Item) value));
612612
break;
613613
case BLOCK_POSITION:
614-
final Position position = (Position) value;
614+
final BlockPosition position = (BlockPosition) value;
615615
metadata.setValue(position);
616616
break;
617617
case ROTATIONS:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +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.minecraft.Position;
24+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
2525
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9;
2626
import com.viaversion.viaversion.api.minecraft.item.Item;
2727
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
@@ -208,7 +208,7 @@ public void register() {
208208
wrapper.cancel();
209209
final PacketWrapper swapItems = PacketWrapper.create(ServerboundPackets1_9.PLAYER_ACTION, wrapper.user());
210210
swapItems.write(Types.VAR_INT, 6);
211-
swapItems.write(Types.BLOCK_POSITION1_8, new Position(0, 0, 0));
211+
swapItems.write(Types.BLOCK_POSITION1_8, new BlockPosition(0, 0, 0));
212212
swapItems.write(Types.BYTE, (byte) 255);
213213

214214
swapItems.sendToServer(Protocol1_9To1_8.class);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
2323
import com.viaversion.viarewind.protocol.v1_9to1_8.data.EffectIdMappings1_8;
2424
import com.viaversion.viaversion.api.connection.UserConnection;
25+
import com.viaversion.viaversion.api.minecraft.BlockPosition;
2526
import com.viaversion.viaversion.api.minecraft.Environment;
26-
import com.viaversion.viaversion.api.minecraft.Position;
2727
import com.viaversion.viaversion.api.minecraft.chunks.BaseChunk;
2828
import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
2929
import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
@@ -151,7 +151,7 @@ public void register() {
151151
chunk.getBlockEntities().forEach(nbt -> {
152152
if (!nbt.contains("x") || !nbt.contains("y") || !nbt.contains("z") || !nbt.contains("id"))
153153
return;
154-
Position position = new Position((int) nbt.get("x").getValue(), (int) nbt.get("y").getValue(), (int) nbt.get("z").getValue());
154+
BlockPosition position = new BlockPosition((int) nbt.get("x").getValue(), (int) nbt.get("y").getValue(), (int) nbt.get("z").getValue());
155155
String id = (String) nbt.get("id").getValue();
156156

157157
short action;

0 commit comments

Comments
 (0)