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 00000000..87d84274 Binary files /dev/null and b/app-ui/src/main/resources/app/sandwich.png differ 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 00000000..c3f1748a Binary files /dev/null and b/app-ui/src/main/resources/app/who-is.png differ diff --git a/app-ui/src/main/resources/notes/patch/patch-notes.json b/app-ui/src/main/resources/notes/patch/patch-notes.json index 2c026365..4df9aa0f 100644 --- a/app-ui/src/main/resources/notes/patch/patch-notes.json +++ b/app-ui/src/main/resources/notes/patch/patch-notes.json @@ -1,10 +1,11 @@ { - "version": "1.0.3.0.0", + "version": "1.0.3.1.0", "notes":[ { "title": "Update", - "text": "- Fixed a bug when the amount of currency is not displayed correctly in the notification panel.\n- Fixed a bug when notification panel sometimes did not work.\n- Whisper helper now have own hotkey button.\n- And minor backend improvements.\n\nThank you for staying with us.", + "text": "- Added /whois button to outgoing notification panel.\n- Fixed a bug when sometimes notification panel won't show orb icons.\n- Many backend improvements for rework \"History\" feature in next version.\n- Support tab updated.\n\nHappy new year! If you love MercuryTrade so much it has become your favourite application to play the game - show your appreciation by supporting it! Thanks!", "image" : "", "layout" : "VERTICAL" } - ]} \ No newline at end of file + ] +} \ No newline at end of file