Send UI requests on both entering and ingame states.

This commit is contained in:
MobiusDevelopment 2019-05-15 17:31:16 +00:00
parent 71fb214f95
commit 1677a641d1
26 changed files with 104 additions and 26 deletions

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -128,7 +128,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -136,7 +136,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -137,7 +137,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -144,7 +144,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -151,7 +151,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -67,7 +67,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -128,7 +128,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -131,7 +131,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -131,7 +131,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -132,7 +132,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),

View File

@ -28,5 +28,11 @@ public enum ConnectionState implements IConnectionState
CLOSING,
AUTHENTICATED,
ENTERING,
IN_GAME
IN_GAME;
public final static ConnectionState[] ENTERING_AND_IN_GAME = new ConnectionState[]
{
ConnectionState.ENTERING,
ConnectionState.IN_GAME
};
}

View File

@ -132,7 +132,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
REQUEST_EX_RQ_ITEM_LINK(0x1E, RequestExRqItemLink::new, ConnectionState.IN_GAME),
CANNOT_MOVE_ANYMORE_AIR_SHIP(0x1F, null, ConnectionState.IN_GAME),
MOVE_TO_LOCATION_IN_AIR_SHIP(0x20, MoveToLocationInAirShip::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_KEY_MAPPING(0x21, RequestKeyMapping::new, ConnectionState.ENTERING_AND_IN_GAME),
REQUEST_SAVE_KEY_MAPPING(0x22, RequestSaveKeyMapping::new, ConnectionState.IN_GAME),
REQUEST_EX_REMOVE_ITEM_ATTRIBUTE(0x23, RequestExRemoveItemAttribute::new, ConnectionState.IN_GAME),
REQUEST_SAVE_INVENTORY_ORDER(0x24, RequestSaveInventoryOrder::new, ConnectionState.IN_GAME),