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

Turn npc id magic numbers into constants

Browse Source
This commit is contained in:
P0nk
2021-11-07 12:36:00 +01:00
parent 8d10e3d1b0
commit c022c3595f
24 changed files with 119 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/client/command/commands/gm0/GachaCommand.java
View File

@@ -25,6 +25,7 @@ package client.command.commands.gm0;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import server.ItemInformationProvider;
import server.gachapon.Gachapon;
@@ -39,7 +40,9 @@ public class GachaCommand extends Command {
String search = c.getPlayer().getLastCommandMessage();
String gachaName = "";
String[] names = {"Henesys", "Ellinia", "Perion", "Kerning City", "Sleepywood", "Mushroom Shrine", "Showa Spa Male", "Showa Spa Female", "New Leaf City", "Nautilus Harbor"};
int[] ids = {9100100, 9100101, 9100102, 9100103, 9100104, 9100105, 9100106, 9100107, 9100109, 9100117};
int[] ids = {NpcId.GACHAPON_HENESYS, NpcId.GACHAPON_ELLINIA, NpcId.GACHAPON_PERION, NpcId.GACHAPON_KERNING,
NpcId.GACHAPON_SLEEPYWOOD, NpcId.GACHAPON_MUSHROOM_SHRINE, NpcId.GACHAPON_SHOWA_MALE,
NpcId.GACHAPON_SHOWA_FEMALE, NpcId.GACHAPON_NLC, NpcId.GACHAPON_NAUTILUS};
for (int i = 0; i < names.length; i++) {
if (search.equalsIgnoreCase(names[i])) {
gachaName = names[i];
@@ -61,6 +64,6 @@ public class GachaCommand extends Command {
}
talkStr += "\r\nPlease keep in mind that there are items that are in all gachapons and are not listed here.";
c.getAbstractPlayerInteraction().npcTalk(9010000, talkStr);
c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, talkStr);
}
}

3
src/main/java/client/command/commands/gm0/HelpCommand.java
View File

@@ -25,6 +25,7 @@ package client.command.commands.gm0;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
public class HelpCommand extends Command {
{
@@ -33,6 +34,6 @@ public class HelpCommand extends Command {
@Override
public void execute(Client client, String[] params) {
client.getAbstractPlayerInteraction().openNpc(9201143, "commands");
client.getAbstractPlayerInteraction().openNpc(NpcId.STEWARD, "commands");
}
}

3
src/main/java/client/command/commands/gm0/RanksCommand.java
View File

@@ -26,6 +26,7 @@ package client.command.commands.gm0;
import client.Character;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import net.server.Server;
import net.server.guild.GuildPackets;
import tools.Pair;
@@ -42,6 +43,6 @@ public class RanksCommand extends Command {
Character player = c.getPlayer();
List<Pair<String, Integer>> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());
player.sendPacket(GuildPackets.showPlayerRanks(9010000, worldRanking));
player.sendPacket(GuildPackets.showPlayerRanks(NpcId.MAPLE_ADMINISTRATOR, worldRanking));
}
}

3
src/main/java/client/command/commands/gm0/StaffCommand.java
View File

@@ -25,6 +25,7 @@ package client.command.commands.gm0;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
public class StaffCommand extends Command {
{
@@ -33,6 +34,6 @@ public class StaffCommand extends Command {
@Override
public void execute(Client c, String[] params) {
c.getAbstractPlayerInteraction().openNpc(2010007, "credits");
c.getAbstractPlayerInteraction().openNpc(NpcId.HERACLE, "credits");
}
}

5
src/main/java/client/command/commands/gm1/GotoCommand.java
View File

@@ -27,6 +27,7 @@ import client.Character;
import client.Client;
import client.command.Command;
import constants.game.GameConstants;
import constants.id.NpcId;
import server.maps.*;
import java.util.ArrayList;
@@ -80,7 +81,7 @@ public class GotoCommand extends Command {
sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO);
}
player.getAbstractPlayerInteraction().npcTalk(9000020, sendStr);
player.getAbstractPlayerInteraction().npcTalk(NpcId.SPINEL, sendStr);
return;
}
@@ -118,7 +119,7 @@ public class GotoCommand extends Command {
sendStr += ("\r\n#rAreas:#k\r\n" + GOTO_AREAS_INFO);
}
player.getAbstractPlayerInteraction().npcTalk(9000020, sendStr);
player.getAbstractPlayerInteraction().npcTalk(NpcId.SPINEL, sendStr);
}
}
}

3
src/main/java/client/command/commands/gm1/WhatDropsFromCommand.java
View File

@@ -26,6 +26,7 @@ package client.command.commands.gm1;
import client.Character;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import server.ItemInformationProvider;
import server.life.MonsterDropEntry;
import server.life.MonsterInformationProvider;
@@ -72,6 +73,6 @@ public class WhatDropsFromCommand extends Command {
}
}
c.getAbstractPlayerInteraction().npcTalk(9010000, output);
c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, output);
}
}

3
src/main/java/client/command/commands/gm1/WhoDropsCommand.java
View File

@@ -26,6 +26,7 @@ package client.command.commands.gm1;
import client.Character;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import server.ItemInformationProvider;
import server.life.MonsterInformationProvider;
import tools.DatabaseConnection;
@@ -84,7 +85,7 @@ public class WhoDropsCommand extends Command {
return;
}
c.getAbstractPlayerInteraction().npcTalk(9010000, output);
c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, output);
} finally {
c.releaseClient();
}

3
src/main/java/client/command/commands/gm2/IdCommand.java
View File

@@ -3,6 +3,7 @@ package client.command.commands.gm2;
import client.Character;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import server.ThreadManager;
import tools.exceptions.IdTypeNotSupportedException;
@@ -55,7 +56,7 @@ public class IdCommand extends Command {
}
sb.append(String.format("Results found: #r%d#k | Returned: #b%d#k/100 | Refine search query to improve time.", resultList.size(), count) + "\r\n");
player.getAbstractPlayerInteraction().npcTalk(9010000, sb.toString());
player.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, sb.toString());
} else {
player.yellowMessage(String.format("Id not found for item: %s, of type: %s.", queryItem, params[0]));
}

3
src/main/java/client/command/commands/gm2/SearchCommand.java
View File

@@ -26,6 +26,7 @@ package client.command.commands.gm2;
import client.Character;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
@@ -133,6 +134,6 @@ public class SearchCommand extends Command {
}
sb.append("\r\n#kLoaded within ").append((double) (System.currentTimeMillis() - start) / 1000).append(" seconds.");//because I can, and it's free
c.getAbstractPlayerInteraction().npcTalk(9010000, sb.toString());
c.getAbstractPlayerInteraction().npcTalk(NpcId.MAPLE_ADMINISTRATOR, sb.toString());
}
}

5
src/main/java/client/command/commands/gm3/MusicCommand.java
View File

@@ -27,6 +27,7 @@ import client.Character;
import client.Client;
import client.command.Command;
import constants.game.GameConstants;
import constants.id.NpcId;
import tools.PacketCreator;
public class MusicCommand extends Command {
@@ -53,7 +54,7 @@ public class MusicCommand extends Command {
sendMsg += "Syntax: #r!music <song>#k\r\n\r\n";
sendMsg += getSongList();
c.sendPacket(PacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
c.sendPacket(PacketCreator.getNPCTalk(NpcId.BILLY, (byte) 0, sendMsg, "00 00", (byte) 0));
return;
}
@@ -70,6 +71,6 @@ public class MusicCommand extends Command {
sendMsg += "Song not found, please enter a song below.\r\n\r\n";
sendMsg += getSongList();
c.sendPacket(PacketCreator.getNPCTalk(1052015, (byte) 0, sendMsg, "00 00", (byte) 0));
c.sendPacket(PacketCreator.getNPCTalk(NpcId.BILLY, (byte) 0, sendMsg, "00 00", (byte) 0));
}
}

3
src/main/java/client/command/commands/gm5/DebugCommand.java
View File

@@ -26,6 +26,7 @@ package client.command.commands.gm5;
import client.Character;
import client.Client;
import client.command.Command;
import constants.id.NpcId;
import net.server.Server;
import server.TimerManager;
import server.life.Monster;
@@ -63,7 +64,7 @@ public class DebugCommand extends Command {
msgTypes += ("#L" + i + "#" + debugTypes[i] + "#l\r\n");
}
c.getAbstractPlayerInteraction().npcTalk(9201143, msgTypes);
c.getAbstractPlayerInteraction().npcTalk(NpcId.STEWARD, msgTypes);
break;
case "monster":