From 8672de7175f449f1728a06bf27b5ca379a21755a Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Fri, 10 Jan 2020 10:08:52 +1030 Subject: [PATCH 1/5] Added /version command --- .../maptool/client/macro/MacroManager.java | 2 +- .../client/macro/impl/VersionMacro.java | 28 +++++++++++++++++++ .../rptools/maptool/language/i18n.properties | 3 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java diff --git a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java index 2265c7222b..9a684ca840 100644 --- a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java +++ b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java @@ -78,7 +78,7 @@ public class MacroManager { registerMacro(new EmotePluralMacro()); registerMacro(new ExperimentsMacro()); registerMacro(new TextureNoise()); - + registerMacro(new VersionMacro()); registerMacro(UNDEFINED_MACRO); } diff --git a/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java b/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java new file mode 100644 index 0000000000..fb7b27c48f --- /dev/null +++ b/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java @@ -0,0 +1,28 @@ +package net.rptools.maptool.client.macro.impl; + +import net.rptools.maptool.client.MapTool; +import net.rptools.maptool.client.MapToolMacroContext; +import net.rptools.maptool.client.macro.Macro; +import net.rptools.maptool.client.macro.MacroContext; +import net.rptools.maptool.client.macro.MacroDefinition; +import net.rptools.maptool.language.I18N; + +@MacroDefinition( + name = "version", + aliases = {"v"}, + description = "slashversion.description") + +/** + * This class represents the /version command run from the chat panel. + */ +public class VersionMacro implements Macro { + + @Override + public void execute(MacroContext context, String macro, MapToolMacroContext executionContext) { + String versionString = MapTool.getVersion(); + if ("unspecified".equalsIgnoreCase(versionString)) { + versionString += " (development build)"; + } + MapTool.addLocalMessage(I18N.getText("slashversion.message", versionString)); + } +} diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties index c30451d9ef..309d84810f 100644 --- a/src/main/resources/net/rptools/maptool/language/i18n.properties +++ b/src/main/resources/net/rptools/maptool/language/i18n.properties @@ -1330,6 +1330,9 @@ texturenoise.currentValsOn = Current Values, alpha = {0}, seed = {1}. texturenoise.currentValsOff = Noise is currently off. texturenoise.usage = To change use /texturenoise alpha [seed] or /texturenoise on | off. +# Version slash command +slashversion.description = Display the MapTool Version in the chat window. +slashversion.message = MapTool Version {0}. # Slash Command errors slash.mustBeGM = You must be a GM to use "/{0}". From 4ffe09ad97f8cfeaa395f9867002a6cbcbfce99b Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Fri, 10 Jan 2020 11:17:25 +1030 Subject: [PATCH 2/5] Added about slash command --- .../maptool/client/functions/AboutMacro.java | 22 +++++++++++++++++++ .../maptool/client/macro/MacroManager.java | 2 ++ .../rptools/maptool/language/i18n.properties | 3 +++ 3 files changed, 27 insertions(+) create mode 100644 src/main/java/net/rptools/maptool/client/functions/AboutMacro.java diff --git a/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java b/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java new file mode 100644 index 0000000000..7d21cfbb72 --- /dev/null +++ b/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java @@ -0,0 +1,22 @@ +package net.rptools.maptool.client.functions; + +import net.rptools.maptool.client.AppActions; +import net.rptools.maptool.client.AppActions.ClientAction; +import net.rptools.maptool.client.MapToolMacroContext; +import net.rptools.maptool.client.macro.Macro; +import net.rptools.maptool.client.macro.MacroContext; +import net.rptools.maptool.client.macro.MacroDefinition; + +@MacroDefinition( + name = "about", + aliases = {"a"}, + description = "slashabout.description") + +public class AboutMacro implements Macro { + + + @Override + public void execute(MacroContext context, String macro, MapToolMacroContext executionContext) { + ((ClientAction) AppActions.SHOW_ABOUT).execute(null); + } +} diff --git a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java index 9a684ca840..016fdf98fb 100644 --- a/src/main/java/net/rptools/maptool/client/macro/MacroManager.java +++ b/src/main/java/net/rptools/maptool/client/macro/MacroManager.java @@ -20,6 +20,7 @@ import net.rptools.maptool.client.MapTool; import net.rptools.maptool.client.MapToolMacroContext; import net.rptools.maptool.client.functions.AbortFunction; +import net.rptools.maptool.client.functions.AboutMacro; import net.rptools.maptool.client.functions.AssertFunction; import net.rptools.maptool.client.macro.impl.*; import net.rptools.maptool.client.ui.MapToolFrame; @@ -79,6 +80,7 @@ public class MacroManager { registerMacro(new ExperimentsMacro()); registerMacro(new TextureNoise()); registerMacro(new VersionMacro()); + registerMacro(new AboutMacro()); registerMacro(UNDEFINED_MACRO); } diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties index 309d84810f..891190c67f 100644 --- a/src/main/resources/net/rptools/maptool/language/i18n.properties +++ b/src/main/resources/net/rptools/maptool/language/i18n.properties @@ -1334,6 +1334,9 @@ texturenoise.usage = To change use /texturenoise alpha [seed] or /texturenoise o slashversion.description = Display the MapTool Version in the chat window. slashversion.message = MapTool Version {0}. +# About slash command +slashabout.description = Display the about dialog. + # Slash Command errors slash.mustBeGM = You must be a GM to use "/{0}". From 277757ca30caeda522590a95f4afbfab3344a44a Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Fri, 10 Jan 2020 11:24:21 +1030 Subject: [PATCH 3/5] Spotless Apply --- .../maptool/client/functions/AboutMacro.java | 16 ++++++++++++++-- .../client/macro/impl/VersionMacro.java | 18 +++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java b/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java index 7d21cfbb72..7cc5822672 100644 --- a/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java +++ b/src/main/java/net/rptools/maptool/client/functions/AboutMacro.java @@ -1,3 +1,17 @@ +/* + * This software Copyright by the RPTools.net development team, and + * licensed under the Affero GPL Version 3 or, at your option, any later + * version. + * + * MapTool Source Code is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public + * License * along with this source Code. If not, please visit + * and specifically the Affero license + * text at . + */ package net.rptools.maptool.client.functions; import net.rptools.maptool.client.AppActions; @@ -11,10 +25,8 @@ name = "about", aliases = {"a"}, description = "slashabout.description") - public class AboutMacro implements Macro { - @Override public void execute(MacroContext context, String macro, MapToolMacroContext executionContext) { ((ClientAction) AppActions.SHOW_ABOUT).execute(null); diff --git a/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java b/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java index fb7b27c48f..53f98cd153 100644 --- a/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java +++ b/src/main/java/net/rptools/maptool/client/macro/impl/VersionMacro.java @@ -1,3 +1,17 @@ +/* + * This software Copyright by the RPTools.net development team, and + * licensed under the Affero GPL Version 3 or, at your option, any later + * version. + * + * MapTool Source Code is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public + * License * along with this source Code. If not, please visit + * and specifically the Affero license + * text at . + */ package net.rptools.maptool.client.macro.impl; import net.rptools.maptool.client.MapTool; @@ -12,9 +26,7 @@ aliases = {"v"}, description = "slashversion.description") -/** - * This class represents the /version command run from the chat panel. - */ +/** This class represents the /version command run from the chat panel. */ public class VersionMacro implements Macro { @Override From 071a1738dd1251327d81d77222eb46024e8934bd Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Fri, 10 Jan 2020 21:33:04 +1030 Subject: [PATCH 4/5] Add version to title bar. --- src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java index b331927517..e49ce26e9d 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -1606,8 +1606,11 @@ public void setCurrentZoneRenderer(ZoneRenderer renderer) { */ public void setTitleViaRenderer(ZoneRenderer renderer) { String campaignName = " - [" + MapTool.getCampaign().getName() + "]"; + String versionString = MapTool.getVersion().equals("unspecified") ? "Development" : "v" + MapTool.getVersion(); setTitle( AppConstants.APP_NAME + + " " + + versionString + " - " + MapTool.getPlayer() + campaignName From 413ce86a9c228373ed346804522116d8c450c925 Mon Sep 17 00:00:00 2001 From: Craig Wisniewski Date: Fri, 10 Jan 2020 21:59:09 +1030 Subject: [PATCH 5/5] spotlessApply --- src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java index e49ce26e9d..69f871e1ed 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -1606,7 +1606,8 @@ public void setCurrentZoneRenderer(ZoneRenderer renderer) { */ public void setTitleViaRenderer(ZoneRenderer renderer) { String campaignName = " - [" + MapTool.getCampaign().getName() + "]"; - String versionString = MapTool.getVersion().equals("unspecified") ? "Development" : "v" + MapTool.getVersion(); + String versionString = + MapTool.getVersion().equals("unspecified") ? "Development" : "v" + MapTool.getVersion(); setTitle( AppConstants.APP_NAME + " "