From e31894caae5f2bab1bc4e2650aff31fc70fa02fd Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:46:32 +0200 Subject: [PATCH] Rename and clean up MapleMarriage --- src/main/java/client/Character.java | 6 ++--- .../channel/handlers/WeddingHandler.java | 8 +++--- .../scripting/AbstractPlayerInteraction.java | 4 +-- .../java/scripting/event/EventManager.java | 6 ++--- .../scripting/npc/NPCConversationManager.java | 4 +-- .../{MapleMarriage.java => Marriage.java} | 25 +++++++++---------- 6 files changed, 26 insertions(+), 27 deletions(-) rename src/main/java/server/{MapleMarriage.java => Marriage.java} (94%) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 890e00f1a5..3f3ee85717 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -4759,11 +4759,11 @@ public class Character extends AbstractCharacterObject { } } - public MapleMarriage getMarriageInstance() { + public Marriage getMarriageInstance() { EventInstanceManager eim = getEventInstance(); - if (eim != null || !(eim instanceof MapleMarriage)) { - return (MapleMarriage) eim; + if (eim != null || !(eim instanceof Marriage)) { + return (Marriage) eim; } else { return null; } diff --git a/src/main/java/net/server/channel/handlers/WeddingHandler.java b/src/main/java/net/server/channel/handlers/WeddingHandler.java index ac996cd85c..f66fdfba9e 100644 --- a/src/main/java/net/server/channel/handlers/WeddingHandler.java +++ b/src/main/java/net/server/channel/handlers/WeddingHandler.java @@ -18,7 +18,7 @@ import config.YamlConfig; import constants.inventory.ItemConstants; import net.AbstractPacketHandler; import net.packet.InPacket; -import server.MapleMarriage; +import server.Marriage; import tools.PacketCreator; import tools.packets.WeddingPackets; @@ -44,7 +44,7 @@ public final class WeddingHandler extends AbstractPacketHandler { int itemid = p.readInt(); short quantity = p.readShort(); - MapleMarriage marriage = c.getPlayer().getMarriageInstance(); + Marriage marriage = c.getPlayer().getMarriageInstance(); if (marriage != null) { try { boolean groomWishlist = marriage.giftItemToSpouse(chr.getId()); @@ -105,7 +105,7 @@ public final class WeddingHandler extends AbstractPacketHandler { p.readByte(); // invType int itemPos = p.readByte(); - MapleMarriage marriage = chr.getMarriageInstance(); + Marriage marriage = chr.getMarriageInstance(); if (marriage != null) { Boolean groomWishlist = marriage.isMarriageGroom(chr); if (groomWishlist != null) { @@ -133,7 +133,7 @@ public final class WeddingHandler extends AbstractPacketHandler { Item item = items.get(itemPos); if (Inventory.checkSpot(chr, item)) { items.remove(itemPos); - MapleMarriage.saveGiftItemsToDb(c, items, chr.getId()); + Marriage.saveGiftItemsToDb(c, items, chr.getId()); InventoryManipulator.addFromDrop(c, item, true); c.sendPacket(WeddingPackets.onWeddingGiftResult((byte) 0xF, Collections.singletonList(""), items)); diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java index 84c978fb9e..5920e227ab 100644 --- a/src/main/java/scripting/AbstractPlayerInteraction.java +++ b/src/main/java/scripting/AbstractPlayerInteraction.java @@ -37,7 +37,7 @@ import scripting.event.EventInstanceManager; import scripting.event.EventManager; import scripting.npc.NPCScriptManager; import server.ItemInformationProvider; -import server.MapleMarriage; +import server.Marriage; import server.expeditions.Expedition; import server.expeditions.ExpeditionBossLog; import server.expeditions.ExpeditionType; @@ -1131,7 +1131,7 @@ public class AbstractPlayerInteraction { } public List getUnclaimedMarriageGifts() { - return MapleMarriage.loadGiftItemsFromDb(this.getClient(), this.getPlayer().getId()); + return Marriage.loadGiftItemsFromDb(this.getClient(), this.getPlayer().getId()); } public boolean startDungeonInstance(int dungeonid) { diff --git a/src/main/java/scripting/event/EventManager.java b/src/main/java/scripting/event/EventManager.java index 05a14ce223..c2a8fceb1a 100644 --- a/src/main/java/scripting/event/EventManager.java +++ b/src/main/java/scripting/event/EventManager.java @@ -35,7 +35,7 @@ import net.server.world.Party; import net.server.world.PartyCharacter; import net.server.world.World; import scripting.event.scheduler.EventScriptScheduler; -import server.MapleMarriage; +import server.Marriage; import server.ThreadManager; import server.expeditions.Expedition; import server.life.LifeFactory; @@ -244,8 +244,8 @@ public class EventManager { return ret; } - public MapleMarriage newMarriage(String name) throws EventInstanceInProgressException { - MapleMarriage ret = new MapleMarriage(this, name); + public Marriage newMarriage(String name) throws EventInstanceInProgressException { + Marriage ret = new Marriage(this, name); synchronized (instances) { if (instances.containsKey(name)) { diff --git a/src/main/java/scripting/npc/NPCConversationManager.java b/src/main/java/scripting/npc/NPCConversationManager.java index 9f4553614a..7152d49c04 100644 --- a/src/main/java/scripting/npc/NPCConversationManager.java +++ b/src/main/java/scripting/npc/NPCConversationManager.java @@ -1066,7 +1066,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { public void sendMarriageWishlist(boolean groom) { Character player = this.getPlayer(); - MapleMarriage marriage = player.getMarriageInstance(); + Marriage marriage = player.getMarriageInstance(); if(marriage != null) { int cid = marriage.getIntProperty(groom ? "groomId" : "brideId"); Character chr = marriage.getPlayerById(cid); @@ -1086,7 +1086,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction { } public boolean createMarriageWishlist() { - MapleMarriage marriage = this.getPlayer().getMarriageInstance(); + Marriage marriage = this.getPlayer().getMarriageInstance(); if (marriage != null) { Boolean groom = marriage.isMarriageGroom(this.getPlayer()); if (groom != null) { diff --git a/src/main/java/server/MapleMarriage.java b/src/main/java/server/Marriage.java similarity index 94% rename from src/main/java/server/MapleMarriage.java rename to src/main/java/server/Marriage.java index f4910a0177..e44a7a85f2 100644 --- a/src/main/java/server/MapleMarriage.java +++ b/src/main/java/server/Marriage.java @@ -39,15 +39,13 @@ import java.util.LinkedList; import java.util.List; /** - * * @author Ronan */ -public class MapleMarriage extends EventInstanceManager { - - public MapleMarriage(EventManager em, String name) { +public class Marriage extends EventInstanceManager { + public Marriage(EventManager em, String name) { super(em, name); } - + public boolean giftItemToSpouse(int cid) { return this.getIntProperty("wishlistSelection") == 0; } @@ -101,7 +99,7 @@ public class MapleMarriage extends EventInstanceManager { gifts.remove(item); } } - + public Boolean isMarriageGroom(Character chr) { Boolean groom = null; try { @@ -111,7 +109,8 @@ public class MapleMarriage extends EventInstanceManager { } else if (chr.getId() == brideid) { groom = false; } - } catch (NumberFormatException nfe) {} + } catch (NumberFormatException nfe) { + } return groom; } @@ -134,10 +133,10 @@ public class MapleMarriage extends EventInstanceManager { return false; } - + public static List loadGiftItemsFromDb(Client c, int cid) { List items = new LinkedList<>(); - + try { for (Pair it : ItemFactory.MARRIAGE_GIFTS.loadItems(cid, false)) { items.add(it.getLeft()); @@ -145,14 +144,14 @@ public class MapleMarriage extends EventInstanceManager { } catch (SQLException sqle) { sqle.printStackTrace(); } - + return items; } - + public void saveGiftItemsToDb(Client c, boolean groom, int cid) { - MapleMarriage.saveGiftItemsToDb(c, getGiftItems(c, groom), cid); + Marriage.saveGiftItemsToDb(c, getGiftItems(c, groom), cid); } - + public static void saveGiftItemsToDb(Client c, List giftItems, int cid) { List> items = new LinkedList<>(); for (Item it : giftItems) {