mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-09 10:28:25 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed deprecated DropItem and PickupItem packets and related code

Browse Source
This commit is contained in:
Collin Smith 2020-06-04 19:46:42 -07:00
parent e472514179
commit 83a95e35fc
7 changed files with 12 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/gen/com/riiablo/net/packet/d2gs/D2GSData.java
View File

@ -12,21 +12,19 @@ public final class D2GSData {
public static final byte Connection = 5;
public static final byte EntitySync = 6;
public static final byte Disconnect = 7;
public static final byte DropItem = 8;
public static final byte PickupItem = 9;
public static final byte GroundToCursor = 10;
public static final byte CursorToGround = 11;
public static final byte StoreToCursor = 12;
public static final byte CursorToStore = 13;
public static final byte SwapStoreItem = 14;
public static final byte BodyToCursor = 15;
public static final byte CursorToBody = 16;
public static final byte SwapBodyItem = 17;
public static final byte BeltToCursor = 18;
public static final byte CursorToBelt = 19;
public static final byte SwapBeltItem = 20;
public static final byte GroundToCursor = 8;
public static final byte CursorToGround = 9;
public static final byte StoreToCursor = 10;
public static final byte CursorToStore = 11;
public static final byte SwapStoreItem = 12;
public static final byte BodyToCursor = 13;
public static final byte CursorToBody = 14;
public static final byte SwapBodyItem = 15;
public static final byte BeltToCursor = 16;
public static final byte CursorToBelt = 17;
public static final byte SwapBeltItem = 18;
public static final String[] names = { "NONE", "WalkToLocation", "WalkToEntity", "RunToLocation", "RunToEntity", "Connection", "EntitySync", "Disconnect", "DropItem", "PickupItem", "GroundToCursor", "CursorToGround", "StoreToCursor", "CursorToStore", "SwapStoreItem", "BodyToCursor", "CursorToBody", "SwapBodyItem", "BeltToCursor", "CursorToBelt", "SwapBeltItem", };
public static final String[] names = { "NONE", "WalkToLocation", "WalkToEntity", "RunToLocation", "RunToEntity", "Connection", "EntitySync", "Disconnect", "GroundToCursor", "CursorToGround", "StoreToCursor", "CursorToStore", "SwapStoreItem", "BodyToCursor", "CursorToBody", "SwapBodyItem", "BeltToCursor", "CursorToBelt", "SwapBeltItem", };
public static String name(int e) { return names[e]; }
}

34
core/gen/com/riiablo/net/packet/d2gs/DropItem.java
View File

@ -1,34 +0,0 @@
// automatically generated by the FlatBuffers compiler, do not modify
package com.riiablo.net.packet.d2gs;
import com.google.flatbuffers.FlatBufferBuilder;
import com.google.flatbuffers.Table;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@SuppressWarnings("unused")
public final class DropItem extends Table {
public static DropItem getRootAsDropItem(ByteBuffer _bb) { return getRootAsDropItem(_bb, new DropItem()); }
public static DropItem getRootAsDropItem(ByteBuffer _bb, DropItem obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
public DropItem __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
public static int createDropItem(FlatBufferBuilder builder,
int itemId) {
builder.startObject(1);
DropItem.addItemId(builder, itemId);
return DropItem.endDropItem(builder);
}
public static void startDropItem(FlatBufferBuilder builder) { builder.startObject(1); }
public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
public static int endDropItem(FlatBufferBuilder builder) {
int o = builder.endObject();
return o;
}
}

34
core/gen/com/riiablo/net/packet/d2gs/PickupItem.java
View File

@ -1,34 +0,0 @@
// automatically generated by the FlatBuffers compiler, do not modify
package com.riiablo.net.packet.d2gs;
import com.google.flatbuffers.FlatBufferBuilder;
import com.google.flatbuffers.Table;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@SuppressWarnings("unused")
public final class PickupItem extends Table {
public static PickupItem getRootAsPickupItem(ByteBuffer _bb) { return getRootAsPickupItem(_bb, new PickupItem()); }
public static PickupItem getRootAsPickupItem(ByteBuffer _bb, PickupItem obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
public void __init(int _i, ByteBuffer _bb) { bb_pos = _i; bb = _bb; vtable_start = bb_pos - bb.getInt(bb_pos); vtable_size = bb.getShort(vtable_start); }
public PickupItem __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
public int itemId() { int o = __offset(4); return o != 0 ? bb.getInt(o + bb_pos) : 0; }
public static int createPickupItem(FlatBufferBuilder builder,
int itemId) {
builder.startObject(1);
PickupItem.addItemId(builder, itemId);
return PickupItem.endPickupItem(builder);
}
public static void startPickupItem(FlatBufferBuilder builder) { builder.startObject(1); }
public static void addItemId(FlatBufferBuilder builder, int itemId) { builder.addInt(0, itemId, 0); }
public static int endPickupItem(FlatBufferBuilder builder) {
int o = builder.endObject();
return o;
}
}

4
core/src/com/riiablo/net/d2gs/D2GS.fbs
View File

@ -5,8 +5,6 @@ include "RunToEntity.fbs";
include "Connection.fbs";
include "Disconnect.fbs";
include "Sync.fbs";
include "DropItem.fbs";
include "PickupItem.fbs";
include "ItemManagement.fbs";
namespace com.riiablo.net.packet.d2gs;
@ -19,8 +17,6 @@ union D2GSData {
Connection,
EntitySync,
Disconnect,
DropItem,
PickupItem,
GroundToCursor,
CursorToGround,
StoreToCursor,

8
core/src/com/riiablo/net/d2gs/DropItem.fbs
View File

@ -1,8 +0,0 @@
namespace com.riiablo.net.packet.d2gs;
table DropItem {
// request
itemId:int32;
// response
}

8
core/src/com/riiablo/net/d2gs/PickupItem.fbs
View File

@ -1,8 +0,0 @@
namespace com.riiablo.net.packet.d2gs;
table PickupItem {
// request
itemId:int32;
// response
}

32
server/d2gs/src/com/riiablo/server/d2gs/D2GS.java
View File

@ -45,9 +45,6 @@ import com.riiablo.engine.server.ServerNetworkIdManager;
import com.riiablo.engine.server.VelocityAdder;
import com.riiablo.engine.server.WarpInteractor;
import com.riiablo.engine.server.component.Networked;
import com.riiablo.engine.server.component.Player;
import com.riiablo.engine.server.component.Position;
import com.riiablo.item.Item;
import com.riiablo.map.Act1MapBuilder;
import com.riiablo.map.DS1;
import com.riiablo.map.DS1Loader;
@ -65,7 +62,6 @@ import com.riiablo.net.packet.d2gs.CursorToGround;
import com.riiablo.net.packet.d2gs.CursorToStore;
import com.riiablo.net.packet.d2gs.D2GSData;
import com.riiablo.net.packet.d2gs.Disconnect;
import com.riiablo.net.packet.d2gs.DropItem;
import com.riiablo.net.packet.d2gs.GroundToCursor;
import com.riiablo.net.packet.d2gs.StoreToCursor;
import com.riiablo.net.packet.d2gs.SwapBeltItem;
@ -397,12 +393,6 @@ public class D2GS extends ApplicationAdapter {
case D2GSData.EntitySync:
Synchronize(packet);
break;
case D2GSData.DropItem:
// DropItem(packet);
break;
case D2GSData.PickupItem:
// PickupItem(packet);
break;
case D2GSData.GroundToCursor:
GroundToCursor(packet);
break;
@ -546,28 +536,6 @@ public class D2GS extends ApplicationAdapter {
sync.sync(entityId, packet.data);
}
@Deprecated
private void DropItem(Packet packet) {
int entityId = player.get(packet.id, Engine.INVALID_ENTITY);
assert entityId != Engine.INVALID_ENTITY;
DropItem dropItem = (DropItem) packet.data.data(new DropItem());
int itemId = dropItem.itemId();
Player player = world.getMapper(Player.class).get(entityId);
CharData charData = player.data;
Item item = charData.getItems().remove(itemId);
assert item != null;
Vector2 position = world.getMapper(Position.class).get(entityId).position;
factory.createItem(item, position);
}
@Deprecated
private void PickupItem(Packet packet) {
}
private int getPlayerEntityId(Packet packet) {
int entityId = player.get(packet.id, Engine.INVALID_ENTITY);
assert entityId != Engine.INVALID_ENTITY;