From 0ea80afc2cec274713be7c2ff94750c6f92925c7 Mon Sep 17 00:00:00 2001 From: exslims Date: Sat, 30 Dec 2017 10:20:55 +0400 Subject: [PATCH] 1.0.3.1.0 release commit --- .../mercury/platform/core/MercuryConstants.java | 2 +- .../impl/HotKeyConfigurationService.java | 8 ++++++++ .../shared/config/descriptor/HotKeyType.java | 11 +++++++++++ .../notification/TradeOutNotificationPanel.java | 4 ++++ .../NotificationOutgoingController.java | 5 +++++ .../controller/OutgoingPanelController.java | 2 ++ .../controller/stub/OutStubController.java | 5 +++++ .../panel/settings/page/SupportPagePanel.java | 3 +++ .../platform/ui/frame/titled/SettingsFrame.java | 5 ++--- .../platform/ui/misc/TooltipConstants.java | 1 + app-ui/src/main/resources/app/sandwich.png | Bin 0 -> 252 bytes app-ui/src/main/resources/app/who-is.png | Bin 0 -> 975 bytes .../main/resources/notes/patch/patch-notes.json | 7 ++++--- 13 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 app-ui/src/main/resources/app/sandwich.png create mode 100644 app-ui/src/main/resources/app/who-is.png diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java index d586943d..e69a7cf5 100644 --- a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java +++ b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java @@ -1,7 +1,7 @@ package com.mercury.platform.core; public class MercuryConstants { - public static final String APP_VERSION = "1.0.3.0.0"; + public static final String APP_VERSION = "1.0.3.1.0"; public static final String SERVER_HOST = "exslims.ddns.net"; public static final int PORT = 5555; } diff --git a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java index 33ff0e4f..3570a627 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java +++ b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java @@ -29,6 +29,7 @@ public HotKeysSettingsDescriptor getDefault() { outNDataList.add(new HotKeyPair(HotKeyType.N_TRADE_PLAYER, new HotKeyDescriptor())); outNDataList.add(new HotKeyPair(HotKeyType.N_LEAVE, new HotKeyDescriptor())); outNDataList.add(new HotKeyPair(HotKeyType.N_OPEN_CHAT, new HotKeyDescriptor())); + outNDataList.add(new HotKeyPair(HotKeyType.N_WHO_IS, new HotKeyDescriptor())); outNDataList.add(new HotKeyPair(HotKeyType.N_REPEAT_MESSAGE, new HotKeyDescriptor())); outNDataList.add(new HotKeyPair(HotKeyType.N_CLOSE_NOTIFICATION, new HotKeyDescriptor())); @@ -56,6 +57,13 @@ public void validate() { if (this.selectedProfile.getHotkeysSettingsDescriptor() == null) { this.selectedProfile.setHotkeysSettingsDescriptor(this.getDefault()); } + if (this.selectedProfile.getHotkeysSettingsDescriptor() + .getOutNHotKeysList().stream() + .filter(it -> it.getType().equals(HotKeyType.N_WHO_IS)) + .findAny().orElse(null) == null) { + this.selectedProfile.getHotkeysSettingsDescriptor() + .getOutNHotKeysList().add(new HotKeyPair(HotKeyType.N_WHO_IS, new HotKeyDescriptor())); + } } @Override diff --git a/app-core/src/main/java/com/mercury/platform/shared/config/descriptor/HotKeyType.java b/app-core/src/main/java/com/mercury/platform/shared/config/descriptor/HotKeyType.java index 812366c9..3f0dd171 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/config/descriptor/HotKeyType.java +++ b/app-core/src/main/java/com/mercury/platform/shared/config/descriptor/HotKeyType.java @@ -129,6 +129,17 @@ public String getTooltip() { return null; } }, + N_WHO_IS { + @Override + public String getIconPath() { + return "app/who-is.png"; + } + + @Override + public String getTooltip() { + return "Who is?"; + } + }, //scanner N_QUICK_RESPONSE { @Override diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/TradeOutNotificationPanel.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/TradeOutNotificationPanel.java index 7f741fd4..fff99819 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/TradeOutNotificationPanel.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/TradeOutNotificationPanel.java @@ -49,6 +49,8 @@ protected JPanel getHeader() { }); JButton openChatButton = componentsFactory.getIconButton("app/openChat.png", 15, AppThemeColor.MSG_HEADER, TooltipConstants.OPEN_CHAT); openChatButton.addActionListener(e -> controller.performOpenChat()); + JButton whoIsButton = componentsFactory.getIconButton("app/who-is.png", 15, AppThemeColor.MSG_HEADER, TooltipConstants.WHO_IS); + whoIsButton.addActionListener(e -> controller.performWhoIs()); JButton hideButton = componentsFactory.getIconButton("app/close.png", 15, AppThemeColor.MSG_HEADER, TooltipConstants.HIDE_PANEL); hideButton.addActionListener(action -> { this.controller.performHide(); @@ -56,12 +58,14 @@ protected JPanel getHeader() { interactionPanel.add(visiteHideout); interactionPanel.add(tradeButton); interactionPanel.add(leaveButton); + interactionPanel.add(whoIsButton); interactionPanel.add(openChatButton); interactionPanel.add(hideButton); this.interactButtonMap.clear(); this.interactButtonMap.put(HotKeyType.N_VISITE_HIDEOUT, visiteHideout); this.interactButtonMap.put(HotKeyType.N_TRADE_PLAYER, tradeButton); this.interactButtonMap.put(HotKeyType.N_LEAVE, leaveButton); + this.interactButtonMap.put(HotKeyType.N_WHO_IS, whoIsButton); this.interactButtonMap.put(HotKeyType.N_OPEN_CHAT, openChatButton); this.interactButtonMap.put(HotKeyType.N_CLOSE_NOTIFICATION, hideButton); diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/NotificationOutgoingController.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/NotificationOutgoingController.java index 6881e266..41de7e98 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/NotificationOutgoingController.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/NotificationOutgoingController.java @@ -18,6 +18,11 @@ public void visitHideout() { MercuryStoreCore.chatCommandSubject.onNext("/hideout " + notificationDescriptor.getWhisperNickname()); } + @Override + public void performWhoIs() { + MercuryStoreCore.chatCommandSubject.onNext("/whois " + notificationDescriptor.getWhisperNickname()); + } + @Override public void performLeave(String nickName) { MercuryStoreCore.chatCommandSubject.onNext("/kick " + nickName); diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/OutgoingPanelController.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/OutgoingPanelController.java index f3f0f590..cbc8d3db 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/OutgoingPanelController.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/OutgoingPanelController.java @@ -4,5 +4,7 @@ public interface OutgoingPanelController extends NotificationController { void visitHideout(); + void performWhoIs(); + void performLeave(String nickName); } diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/stub/OutStubController.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/stub/OutStubController.java index 07ad16bb..4abea9cc 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/stub/OutStubController.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/notification/controller/stub/OutStubController.java @@ -31,6 +31,11 @@ public void visitHideout() { } + @Override + public void performWhoIs() { + + } + @Override public void performLeave(String nickName) { diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java index 886234c1..0fb19467 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java @@ -106,8 +106,11 @@ public void mouseWheelMoved(MouseWheelEvent e) { private List getDonations() { List donations = new ArrayList<>(); donations.add(new DonationPair("222Craft", AppThemeColor.TEXT_DEFAULT)); + donations.add(new DonationPair("Xagulz", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Taw", AppThemeColor.TEXT_DEFAULT)); + donations.add(new DonationPair("AMusel", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Blightsand", AppThemeColor.TEXT_DEFAULT)); + donations.add(new DonationPair("Mattc3303", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("StubenZocker", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("SirKultan", AppThemeColor.TEXT_DEFAULT)); return donations; diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java index 116ffac6..71dc8fd5 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java @@ -156,8 +156,8 @@ private JPanel getOperationsButtons() { JButton openTests = this.getOperationButton("Open tests", "app/open-tests.png"); openTests.addActionListener(action -> { FramesManager.INSTANCE.hideFrame(SettingsFrame.class); - FramesManager.INSTANCE.showFrame(TestCasesFrame.class); -// FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class); +// FramesManager.INSTANCE.showFrame(TestCasesFrame.class); + FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class); }); root.add(this.componentsFactory.wrapToSlide(openTutorial)); root.add(this.componentsFactory.wrapToSlide(checkUpdates)); @@ -178,7 +178,6 @@ public void mouseClicked(MouseEvent e) { } } }); -// root.add(patchNotes); return root; } diff --git a/app-ui/src/main/java/com/mercury/platform/ui/misc/TooltipConstants.java b/app-ui/src/main/java/com/mercury/platform/ui/misc/TooltipConstants.java index 71e0447d..b7cf5ae2 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/misc/TooltipConstants.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/misc/TooltipConstants.java @@ -31,6 +31,7 @@ public class TooltipConstants { public static final String TRADE = "Offer Trade"; public static final String EXPAND_COLLAPSE = "Expand / collapse"; public static final String OPEN_CHAT = "Message this player"; + public static final String WHO_IS = "Who is?"; public static final String SWITCH_CHAT = "Show chat history"; public static final String VISIT_HO = "Visit player's hideout"; public static final String LEAVE = "Leave from party"; diff --git a/app-ui/src/main/resources/app/sandwich.png b/app-ui/src/main/resources/app/sandwich.png new file mode 100644 index 0000000000000000000000000000000000000000..87d842746cbb1414682b6a1d2528f647f4d3edb6 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^S|H591|*LjJ{b+9SkfJR9T^xl_H+M9WCij$3p^r= z85sBufiR<}hF1enP_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(PdBZ+4+$)*YzWAc;3*~JYAQ7oq n+nnAOm>jyu0apEG=6m*i#b4s;Lawd`I)cH|)z4*}Q$iB}sfSoc literal 0 HcmV?d00001 diff --git a/app-ui/src/main/resources/app/who-is.png b/app-ui/src/main/resources/app/who-is.png new file mode 100644 index 0000000000000000000000000000000000000000..c3f1748ad4442acbd9542a8c110d3f3c6452e4bb GIT binary patch literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^UO?=_!3HExbt>inDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5he4R}c>anMprB-lYeY$Kep*R+Vo@qXL1JcJiC$i6iGqoq zfu5ncao+r71_ow(PZ!6KinzCPZm+uRAky~Rr1q>*+%LASxK-v#9r_QZE{f|8%GB=I zz4eB2P=@B$|C3EizPp4Qy_|Jr9euK`Vs;x=TOQA3^*kFbH~E}m za@ghS$$ithFFjl|Wrv2Uo>ymg&?7MOtKe7hEw|s6?~QwJD!hHCKi_h-y&7j~?kgut z^Ub@qv;TNX*_=rwiwZuLpXlSd)t(wrW;By$!g7V)6&EwUh~A8J{QW^@&Tn1rr0%^M zFFjjTSu6CauD#cpA?sNcvM)!FG5N{DGaE!znaf|^6G`B?(=>n60<#(4SG)l7*4QlJ zEL)V~CvtZ-Q^(i(u173E>oy7rOw!(L|LKMJaX*pt+eN)oFTO0f=k>$;@uDd|)-FH7 zUaVTSh-JQ9#(}ky_A7U{7#ckMGlzBS!9DJR^(_|_yj27Fk6wQH#b4}9pNehQX`L7? zO`Y!N5AM8=6o|gmp|mOF(5~}b$&%B2FHB~7>B5>K+K_u=;<2|I?pHjpbE^vc{*YzT z=3KSICzrHUb*?f*3a6K@57*z0-G00F^84@e&prR_{`%`LMPPvSACGYBT7D=@M8Cp7 z!sejbYaUPAhdiBzJx^ofMAW+DZ#ZvQIcZVrMv2KABiXm$%99 z=F*LR*LvTsS{WuX|NfHiF)`;fBg}6He9Zp-%0*YKJN(2X&Rgxd6U{;$_h|5}vY$Bf zPLgZl>>FlVK8k;mc;s?YAvYAkiVD}@vq=*&r-kCMV(>6>2{+i|n*xPbJ%)qa~} zH4n1?E0L~Wc4p`CtgTgjIprs3TgP0Rws;bgO+!e#e2Pa~kEcx6x&1bYikdRBC04I{ p8Bsm+&3(Ovmu@XfGLibv@Ugb#?X!h(!od8-;OXk;vd$@?2>^c