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

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/tools/LogHelper.java
View File

@@ -35,7 +35,7 @@ public class LogHelper {
}
public static void logExpedition(MapleExpedition expedition) {
Server.getInstance().broadcastGMMessage(expedition.getLeader().getWorld(), MaplePacketCreator.serverNotice(6, expedition.getType().toString() + " Expedition with leader " + expedition.getLeader().getName() + " finished after " + getTimeString(expedition.getStartTime())));
Server.getInstance().broadcastGMMessage(expedition.getLeader().getWorld(), PacketCreator.serverNotice(6, expedition.getType().toString() + " Expedition with leader " + expedition.getLeader().getName() + " finished after " + getTimeString(expedition.getStartTime())));
String log = expedition.getType().toString() + " EXPEDITION\r\n";
log += getTimeString(expedition.getStartTime()) + "\r\n";

2
src/main/java/tools/MaplePacketCreator.java → src/main/java/tools/PacketCreator.java
View File

@@ -81,7 +81,7 @@ import java.util.stream.Collectors;
*
* @author Frz
*/
public class MaplePacketCreator {
public class PacketCreator {
public static final List<Pair<MapleStat, Integer>> EMPTY_STATUPDATE = Collections.emptyList();
private final static long FT_UT_OFFSET = 116444736010800000L + (10000L * TimeZone.getDefault().getOffset(System.currentTimeMillis())); // normalize with timezone offset suggested by Ari

6
src/main/java/tools/packets/Fishing.java
View File

@@ -24,7 +24,7 @@ import config.YamlConfig;
import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import server.MapleItemInformationProvider;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.Calendar;
@@ -119,8 +119,8 @@ public class Fishing {
chr.getMap().dropMessage(6, chr.getName() + " found " + rewardStr);
}
chr.announce(MaplePacketCreator.showInfo(fishingEffect));
chr.getMap().broadcastMessage(chr, MaplePacketCreator.showForeignInfo(chr.getId(), fishingEffect), false);
chr.announce(PacketCreator.showInfo(fishingEffect));
chr.getMap().broadcastMessage(chr, PacketCreator.showForeignInfo(chr.getId(), fishingEffect), false);
}
public static int getRandomItem(){

11
src/main/java/tools/packets/Wedding.java
View File

@@ -6,14 +6,15 @@
package tools.packets;
import client.inventory.Item;
import client.MapleCharacter;
import java.util.ArrayList;
import java.util.List;
import tools.MaplePacketCreator;
import client.inventory.Item;
import tools.PacketCreator;
import tools.StringUtil;
import tools.data.output.MaplePacketLittleEndianWriter;
import java.util.ArrayList;
import java.util.List;
/**
* CField_Wedding, CField_WeddingPhoto, CWeddingMan, OnMarriageResult, and all Wedding/Marriage enum/structs.
*
@@ -21,7 +22,7 @@ import tools.data.output.MaplePacketLittleEndianWriter;
*
* Wishlists edited by Drago (Dragohe4rt)
*/
public class Wedding extends MaplePacketCreator {
public class Wedding extends PacketCreator {
private static final short MARRIAGE_REQUEST = 0x48;
private static final short MARRIAGE_RESULT = 0x49;
private static final short WEDDING_GIFT_RESULT = 0x4A;