From 8fd6d3363d1437ec56ea478d94ee66b24252e9f4 Mon Sep 17 00:00:00 2001 From: Exslims Date: Sun, 3 Sep 2017 21:34:49 +0400 Subject: [PATCH] 1.0.2.0.1 release commit --- .../java/com/mercury/platform/core/ChatHelper.java | 11 ++++++++++- .../com/mercury/platform/core/MercuryConstants.java | 2 +- .../panel/settings/page/SupportPagePanel.java | 1 + .../src/main/resources/notes/patch/patch-notes.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app-core/src/main/java/com/mercury/platform/core/ChatHelper.java b/app-core/src/main/java/com/mercury/platform/core/ChatHelper.java index a4b96456..272e5631 100644 --- a/app-core/src/main/java/com/mercury/platform/core/ChatHelper.java +++ b/app-core/src/main/java/com/mercury/platform/core/ChatHelper.java @@ -8,6 +8,7 @@ import com.sun.jna.Native; import com.sun.jna.platform.win32.User32; +import javax.swing.*; import java.awt.*; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; @@ -60,7 +61,7 @@ private void executeTradeMessage() { Clipboard clipboard = toolkit.getSystemClipboard(); try { String result = (String) clipboard.getData(DataFlavor.stringFlavor); - if (result.contains("listed for") || result.contains("for my")) { + if (result != null && (result.contains("listed for") || result.contains("for my"))) { this.gameToFront(); MercuryStoreCore.blockHotkeySubject.onNext(true); robot.keyRelease(KeyEvent.VK_ALT); @@ -81,6 +82,14 @@ private void executeTradeMessage() { robot.keyRelease(KeyEvent.VK_CONTROL); robot.keyPress(KeyEvent.VK_ENTER); robot.keyRelease(KeyEvent.VK_ENTER); + + Timer timer = new Timer(300, action -> { + StringSelection selection = new StringSelection(""); + clipboard.setContents(selection, null); + }); + timer.setRepeats(false); + timer.start(); + MercuryStoreCore.blockHotkeySubject.onNext(false); } } catch (UnsupportedFlavorException | IOException e) { 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 9db7d3ac..033d1bbf 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.2.0.0"; + public static final String APP_VERSION = "1.0.2.0.1"; public static final String SERVER_HOST = "exslims.ddns.net"; public static final int PORT = 5555; } 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 59ec79e0..886234c1 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,6 +106,7 @@ public void mouseWheelMoved(MouseWheelEvent e) { private List getDonations() { List donations = new ArrayList<>(); donations.add(new DonationPair("222Craft", AppThemeColor.TEXT_DEFAULT)); + donations.add(new DonationPair("Taw", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Blightsand", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("StubenZocker", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("SirKultan", AppThemeColor.TEXT_DEFAULT)); 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 3f321d14..5f48235a 100644 --- a/app-ui/src/main/resources/notes/patch/patch-notes.json +++ b/app-ui/src/main/resources/notes/patch/patch-notes.json @@ -1,5 +1,5 @@ { - "version": "1.0.2.0.0", + "version": "1.0.2.0.1", "notes":[ { "title": "Update",