Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quickslot Bindings

Browse Source 
Added quickslot bindings, courtesy of @shavitush.
This commit is contained in:
ronancpl
2019-11-19 01:15:52 -03:00
parent 6d57eb1033
commit 661dcf0a96
12 changed files with 213 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/client/MapleCharacter.java
View File

@@ -123,6 +123,8 @@ import tools.exceptions.NotEnabledException;
import tools.packets.Wedding;
import client.autoban.AutobanManager;
import client.creator.CharacterFactoryRecipe;
import client.keybind.MapleKeyBinding;
import client.keybind.MapleQuickslotBinding;
import client.inventory.Equip;
import client.inventory.Equip.StatUpgrade;
import client.inventory.Item;
@@ -175,8 +177,8 @@ import net.server.services.type.ChannelServices;
import net.server.services.task.channel.FaceExpressionService;
import net.server.services.task.world.CharacterSaveService;
import net.server.services.type.WorldServices;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.util.ConcurrentHashSet;
import tools.LongTool;
public class MapleCharacter extends AbstractMapleCharacterObject {
private static final MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
@@ -277,6 +279,8 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
private Map<Integer, MapleSummon> summons = new LinkedHashMap<>();
private Map<Integer, MapleCoolDownValueHolder> coolDowns = new LinkedHashMap<>();
private EnumMap<MapleDisease, Pair<MapleDiseaseValueHolder, MobSkill>> diseases = new EnumMap<>(MapleDisease.class);
public byte[] m_aQuickslotLoaded;
public MapleQuickslotBinding m_pQuickslotKeyMapped;
private MapleDoor pdoor = null;
private Map<MapleQuest, Long> questExpirations = new LinkedHashMap<>();
private ScheduledFuture<?> dragonBloodSchedule;
@@ -7496,6 +7500,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
ret.maplemount.setTiredness(mounttiredness);
ret.maplemount.setActive(false);
try (final PreparedStatement pSelectQuickslotKeyMapped = con.prepareStatement("SELECT keymap FROM quickslotkeymapped WHERE accountid = ?;")) {
pSelectQuickslotKeyMapped.setInt(1, ret.getAccountID());
try (final ResultSet pResultSet = pSelectQuickslotKeyMapped.executeQuery()) {
if (pResultSet.next()) {
ret.m_aQuickslotLoaded = LongTool.LongToBytes(pResultSet.getLong(1));
ret.m_pQuickslotKeyMapped = new MapleQuickslotBinding(ret.m_aQuickslotLoaded);
}
}
}
con.close();
return ret;
} catch (SQLException | RuntimeException e) {
@@ -8334,6 +8349,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
ps.execute();
}
ps.close();
// No quickslots, or no change.
boolean bQuickslotEquals = this.m_pQuickslotKeyMapped == null || (this.m_aQuickslotLoaded != null && Arrays.equals(this.m_pQuickslotKeyMapped.m_aQuickslotKeyMapped, this.m_aQuickslotLoaded));
if (!bQuickslotEquals) {
long nQuickslotKeymapped = LongTool.BytesToLong(this.m_pQuickslotKeyMapped.m_aQuickslotKeyMapped);
try (final PreparedStatement pInsertStatement = con.prepareStatement("INSERT INTO quickslotkeymapped (accountid, keymap) VALUES (?, ?) ON DUPLICATE KEY UPDATE keymap = ?;")) {
pInsertStatement.setInt(1, this.getAccountID());
pInsertStatement.setLong(2, nQuickslotKeymapped);
pInsertStatement.setLong(3, nQuickslotKeymapped);
pInsertStatement.executeUpdate();
}
}
itemsWithType = new ArrayList<>();
for (MapleInventory iv : inventory) {
@@ -8587,6 +8615,19 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
ps.executeBatch();
ps.close();
// No quickslots, or no change.
boolean bQuickslotEquals = this.m_pQuickslotKeyMapped == null || (this.m_aQuickslotLoaded != null && Arrays.equals(this.m_pQuickslotKeyMapped.m_aQuickslotKeyMapped, this.m_aQuickslotLoaded));
if (!bQuickslotEquals) {
long nQuickslotKeymapped = LongTool.BytesToLong(this.m_pQuickslotKeyMapped.m_aQuickslotKeyMapped);
try (final PreparedStatement pInsertStatement = con.prepareStatement("INSERT INTO quickslotkeymapped (accountid, keymap) VALUES (?, ?) ON DUPLICATE KEY UPDATE keymap = ?;")) {
pInsertStatement.setInt(1, this.getAccountID());
pInsertStatement.setLong(2, nQuickslotKeymapped);
pInsertStatement.setLong(3, nQuickslotKeymapped);
pInsertStatement.executeUpdate();
}
}
deleteWhereCharacterId(con, "DELETE FROM skillmacros WHERE characterid = ?");
ps = con.prepareStatement("INSERT INTO skillmacros (characterid, skill1, skill2, skill3, name, shout, position) VALUES (?, ?, ?, ?, ?, ?, ?)");
ps.setInt(1, getId());
@@ -8824,6 +8865,17 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
public void sendKeymap() {
client.announce(MaplePacketCreator.getKeymap(keymap));
}
public void sendQuickmap() {
// send quickslots to user
MapleQuickslotBinding pQuickslotKeyMapped = this.m_pQuickslotKeyMapped;
if (pQuickslotKeyMapped == null) {
pQuickslotKeyMapped = new MapleQuickslotBinding(MapleQuickslotBinding.DEFAULT_QUICKSLOTS);
}
this.announce(MaplePacketCreator.QuickslotMappedInit(pQuickslotKeyMapped));
}
public void sendMacros() {
// Always send the macro packet to fix a client side bug when switching characters.

2
src/client/MapleKeyBinding.java → src/client/keybind/MapleKeyBinding.java
View File

@@ -19,7 +19,7 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package client;
package client.keybind;
public class MapleKeyBinding {
private int type, action;

55
src/client/keybind/MapleQuickslotBinding.java Normal file
View File

@@ -0,0 +1,55 @@
package client.keybind;
import tools.data.output.MaplePacketLittleEndianWriter;
import java.util.Arrays;
/**
*
* @author Shavit
*/
public class MapleQuickslotBinding
{
public static final int QUICKSLOT_SIZE = 8;
public static final byte[] DEFAULT_QUICKSLOTS =
{
0x2A, 0x52, 0x47, 0x49, 0x1D, 0x53, 0x4F, 0x51
};
public byte[] m_aQuickslotKeyMapped;
// Initializes quickslot object for the user.
// aKeys' length has to be 8.
public MapleQuickslotBinding(byte[] aKeys)
{
if(aKeys.length != QUICKSLOT_SIZE)
{
throw new IllegalArgumentException(String.format("aKeys' size should be %d", QUICKSLOT_SIZE));
}
this.m_aQuickslotKeyMapped = aKeys.clone();
}
public void Encode(MaplePacketLittleEndianWriter oPacket)
{
// Quickslots are default.
// The client will skip them and call CQuickslotKeyMappedMan::DefaultQuickslotKeyMap.
if(Arrays.equals(this.m_aQuickslotKeyMapped, DEFAULT_QUICKSLOTS))
{
oPacket.writeBool(false);
return;
}
oPacket.writeBool(true);
for(byte nKey : this.m_aQuickslotKeyMapped)
{
// For some reason Nexon sends these as integers, similar to CFuncKeyMappedMan.
// However there's no evidence any key can be above 0xFF anyhow.
// Regardless, we need to encode an integer to avoid an error 38 crash; as CFuncKeyMapped::m_aQuickslotKeyMapped is int[8].
oPacket.writeInt(nKey);
}
}
}

1
src/net/PacketProcessor.java
View File

@@ -273,6 +273,7 @@ public final class PacketProcessor {
registerHandler(RecvOpcode.MOVE_DRAGON, new MoveDragonHandler());
registerHandler(RecvOpcode.OPEN_ITEMUI, new RaiseUIStateHandler());
registerHandler(RecvOpcode.USE_ITEMUI, new RaiseIncExpHandler());
registerHandler(RecvOpcode.CHANGE_QUICKSLOT, new QuickslotKeyMappedModifiedHandler());
}
}
}

2
src/net/opcodes/RecvOpcode.java
View File

@@ -173,6 +173,7 @@ public enum RecvOpcode {
DAMAGE_SUMMON(0xB1),
BEHOLDER(0xB2),
MOVE_DRAGON(0xB5),
CHANGE_QUICKSLOT(0xB7),//CP_QuickslotKeyMappedModified
MOVE_LIFE(0xBC),
AUTO_AGGRO(0xBD),
FIELD_DAMAGE_MOB(0xBF),
@@ -202,6 +203,7 @@ public enum RecvOpcode {
MTS_OPERATION(0xFD),
USE_MAPLELIFE(0x100),
USE_HAMMER(0x104);
private int code = -2;
private RecvOpcode(int code) {

1
src/net/opcodes/SendOpcode.java
View File

@@ -188,6 +188,7 @@ public enum SendOpcode {
ARIANT_ARENA_SHOW_RESULT(0x9B),
PYRAMID_GAUGE(0x9D),
PYRAMID_SCORE(0x9E),
QUICKSLOT_INIT(0x9F),//LP_QuickslotMappedInit
SPAWN_PLAYER(0xA0),
REMOVE_PLAYER_FROM_MAP(0xA1),
CHATTEXT(0xA2), //0

2
src/net/server/channel/handlers/KeymapChangeHandler.java
View File

@@ -23,7 +23,7 @@ package net.server.channel.handlers;
import constants.game.GameConstants;
import client.MapleClient;
import client.MapleKeyBinding;
import client.keybind.MapleKeyBinding;
import client.Skill;
import client.SkillFactory;
import client.autoban.AutobanFactory;

3
src/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -53,7 +53,7 @@ import client.MapleClient;
import client.MapleDisease;
import client.MapleFamily;
import client.MapleFamilyEntry;
import client.MapleKeyBinding;
import client.keybind.MapleKeyBinding;
import client.MapleMount;
import client.SkillFactory;
import client.inventory.Equip;
@@ -239,6 +239,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
}
}
player.sendKeymap();
player.sendQuickmap();
player.sendMacros();
// pot bindings being passed through other characters on the account detected thanks to Croosade dev team

34
src/net/server/channel/handlers/QuickslotKeyMappedModifiedHandler.java Normal file
View File

@@ -0,0 +1,34 @@
package net.server.channel.handlers;
import client.MapleClient;
import client.keybind.MapleQuickslotBinding;
import net.AbstractMaplePacketHandler;
import tools.data.input.SeekableLittleEndianAccessor;
/**
*
* @author Shavit
*/
public class QuickslotKeyMappedModifiedHandler extends AbstractMaplePacketHandler
{
@Override
public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c)
{
// Invalid size for the packet.
if(slea.available() != MapleQuickslotBinding.QUICKSLOT_SIZE * Integer.BYTES ||
// not logged in-game
c.getPlayer() == null)
{
return;
}
byte[] aQuickslotKeyMapped = new byte[MapleQuickslotBinding.QUICKSLOT_SIZE];
for(int i = 0; i < MapleQuickslotBinding.QUICKSLOT_SIZE; i++)
{
aQuickslotKeyMapped[i] = (byte) slea.readInt();
}
c.getPlayer().m_pQuickslotKeyMapped = new MapleQuickslotBinding(aQuickslotKeyMapped);
}
}

41
src/tools/LongTool.java Normal file
View File

@@ -0,0 +1,41 @@
package tools;
/**
*
* @author Shavit
*/
public class LongTool {
// Converts 8 bytes to a long.
public static long BytesToLong(byte[] aToConvert)
{
if(aToConvert.length != Long.BYTES)
{
throw new IllegalArgumentException(String.format("Size of input should be %d", (Long.SIZE / 8)));
}
long nResult = 0;
for(int i = 0; i < Long.BYTES; i++)
{
nResult <<= Byte.SIZE;
nResult |= (aToConvert[i] & 0xFF);
}
return nResult;
}
// Converts a long to 8 bytes.
public static byte[] LongToBytes(long nToConvert)
{
byte[] aBytes = new byte[Long.BYTES];
for(int i = aBytes.length - 1; i >= 0; i--)
{
aBytes[i] = (byte) (nToConvert & 0xFF);
nToConvert >>= Byte.SIZE;
}
return aBytes;
}
}

13
src/tools/MaplePacketCreator.java
View File

@@ -43,7 +43,8 @@ import client.MapleClient;
import client.MapleDisease;
import client.MapleFamilyEntitlement;
import client.MapleFamilyEntry;
import client.MapleKeyBinding;
import client.keybind.MapleKeyBinding;
import client.keybind.MapleQuickslotBinding;
import client.MapleMount;
import client.MapleQuestStatus;
import client.MapleRing;
@@ -3614,6 +3615,16 @@ public class MaplePacketCreator {
}
return mplew.getPacket();
}
public static byte[] QuickslotMappedInit(MapleQuickslotBinding pQuickslot)
{
final MaplePacketLittleEndianWriter pOutPacket = new MaplePacketLittleEndianWriter();
pOutPacket.writeShort(SendOpcode.QUICKSLOT_INIT.getValue());
pQuickslot.Encode(pOutPacket);
return pOutPacket.getPacket();
}
public static byte[] getWhisper(String sender, int channel, String text) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();