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

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/client/command/commands/gm0/GmCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -45,15 +45,15 @@ public class GmCommand extends Command {
"Do not ask if you can receive help, just state your issue.",
"Do not say 'I have a bug to report', just state it.",
};
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1 || params[0].length() < 3) { // #goodbye 'hi'
player.dropMessage(5, "Your message was too short. Please provide as much detail as possible.");
return;
}
String message = player.getLastCommandMessage();
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[GM Message]:" + Character.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
FilePrinter.printError(FilePrinter.COMMAND_GM, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message);
FilePrinter.printError(FilePrinter.COMMAND_GM, Character.makeMapleReadable(player.getName()) + ": " + message);
player.dropMessage(5, "Your message '" + message + "' was sent to GMs.");
player.dropMessage(5, tips[Randomizer.nextInt(tips.length)]);
}

4
src/main/java/client/command/commands/gm0/JoinEventCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import server.events.gm.MapleEvent;
@@ -36,7 +36,7 @@ public class JoinEventCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if(!FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
MapleEvent event = c.getChannelServer().getEvent();
if(event != null) {

4
src/main/java/client/command/commands/gm0/LeaveEventCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -34,7 +34,7 @@ public class LeaveEventCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int returnMap = player.getSavedLocation("EVENT");
if(returnMap != -1) {
if(player.getOla() != null) {

4
src/main/java/client/command/commands/gm0/MapOwnerClaimCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -38,7 +38,7 @@ public class MapOwnerClaimCommand extends Command {
public void execute(MapleClient c, String[] params) {
if (c.tryacquireClient()) {
try {
MapleCharacter chr = c.getPlayer();
Character chr = c.getPlayer();
if (YamlConfig.config.server.USE_MAP_OWNERSHIP_SYSTEM) {
if (chr.getEventInstance() == null) {

8
src/main/java/client/command/commands/gm0/OnlineCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -36,12 +36,12 @@ public class OnlineCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
for (Channel ch : Server.getInstance().getChannelsFromWorld(player.getWorld())) {
player.yellowMessage("Players in Channel " + ch.getId() + ":");
for (MapleCharacter chr : ch.getPlayerStorage().getAllCharacters()) {
for (Character chr : ch.getPlayerStorage().getAllCharacters()) {
if (!chr.isGM()) {
player.message(" >> " + MapleCharacter.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + ".");
player.message(" >> " + Character.makeMapleReadable(chr.getName()) + " is at " + chr.getMap().getMapName() + ".");
}
}
}

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

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -39,7 +39,7 @@ public class RanksCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
List<Pair<String, Integer>> worldRanking = Server.getInstance().getWorldPlayerRanking(player.getWorld());
player.sendPacket(GuildPackets.showPlayerRanks(9010000, worldRanking));

4
src/main/java/client/command/commands/gm0/RatesCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class RatesCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
// travel rates not applicable since it's intrinsically a server/environment rate rather than a character rate
String showMsg_ = "#eCHARACTER RATES#n" + "\r\n\r\n";

4
src/main/java/client/command/commands/gm0/ReadPointsCommand.java
View File

@@ -1,6 +1,6 @@
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
@@ -12,7 +12,7 @@ public class ReadPointsCommand extends Command {
@Override
public void execute(MapleClient client, String[] params) {
MapleCharacter player = client.getPlayer();
Character player = client.getPlayer();
if (params.length > 2) {
player.yellowMessage("Syntax: @points (rp|vp|all)");
return;

8
src/main/java/client/command/commands/gm0/ReportBugCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import net.server.Server;
@@ -37,16 +37,16 @@ public class ReportBugCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
if (params.length < 1) {
player.dropMessage(5, "Message too short and not sent. Please do @bug <bug>");
return;
}
String message = player.getLastCommandMessage();
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + MapleCharacter.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.sendYellowTip("[Bug]:" + Character.makeMapleReadable(player.getName()) + ": " + message));
Server.getInstance().broadcastGMMessage(c.getWorld(), PacketCreator.serverNotice(1, message));
FilePrinter.printError(FilePrinter.COMMAND_BUG, MapleCharacter.makeMapleReadable(player.getName()) + ": " + message);
FilePrinter.printError(FilePrinter.COMMAND_BUG, Character.makeMapleReadable(player.getName()) + ": " + message);
player.dropMessage(5, "Your bug '" + message + "' was submitted successfully to our developers. Thank you!");
}

4
src/main/java/client/command/commands/gm0/ShowRatesCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class ShowRatesCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
String showMsg = "#eEXP RATE#n" + "\r\n";
showMsg += "World EXP Rate: #k" + c.getWorldServer().getExpRate() + "x#k" + "\r\n";
showMsg += "Player EXP Rate: #k" + player.getRawExpRate() + "x#k" + "\r\n";

4
src/main/java/client/command/commands/gm0/StatDexCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatDexCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;

4
src/main/java/client/command/commands/gm0/StatIntCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatIntCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;

4
src/main/java/client/command/commands/gm0/StatLukCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatLukCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;

4
src/main/java/client/command/commands/gm0/StatStrCommand.java
View File

@@ -23,7 +23,7 @@
*/
package client.command.commands.gm0;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import client.command.Command;
import config.YamlConfig;
@@ -35,7 +35,7 @@ public class StatStrCommand extends Command {
@Override
public void execute(MapleClient c, String[] params) {
MapleCharacter player = c.getPlayer();
Character player = c.getPlayer();
int remainingAp = player.getRemainingAp();
int amount;
if (params.length > 0) {