From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Fri, 02 Apr 2021 21:28:22 +0530
Subject: Merge pull request #25 from j4ckofalltrades/twitch-chat-update-action-api
---
Merge pull request #25 from j4ckofalltrades/twitch-chat-update-action-api

Twitch chat plugin use latest action-api
---


Binary files 'a/PreBuiltPlugins/twitch-add-stream-marker.jar' and b/PreBuiltPlugins/twitch-add-stream-marker.jar differ

Binary files 'a/PreBuiltPlugins/twitch-chat-connect.jar' and b/PreBuiltPlugins/twitch-chat-connect.jar differ

Binary files 'a/PreBuiltPlugins/twitch-clear-chat.jar' and b/PreBuiltPlugins/twitch-clear-chat.jar differ

Binary files 'a/PreBuiltPlugins/twitch-host-channel.jar' and b/PreBuiltPlugins/twitch-host-channel.jar differ

Binary files 'a/PreBuiltPlugins/twitch-raid-channel.jar' and b/PreBuiltPlugins/twitch-raid-channel.jar differ

Binary files 'a/PreBuiltPlugins/twitch-send-channel-msg.jar' and b/PreBuiltPlugins/twitch-send-channel-msg.jar differ

Binary files 'a/PreBuiltPlugins/twitch-set-color.jar' and b/PreBuiltPlugins/twitch-set-color.jar differ

Binary files 'a/PreBuiltPlugins/twitch-start-commercial.jar' and b/PreBuiltPlugins/twitch-start-commercial.jar differ

Binary files 'a/PreBuiltPlugins/twitch-unhost.jar' and b/PreBuiltPlugins/twitch-unhost.jar differ

Binary files 'a/PreBuiltPlugins/twitch-unraid.jar' and b/PreBuiltPlugins/twitch-unraid.jar differ

Binary files 'a/PreBuiltPlugins/twitch-whisper.jar' and b/PreBuiltPlugins/twitch-whisper.jar differ

--- 'a/twitch/add-stream-marker/pom.xml'
+++ b/twitch/add-stream-marker/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/add-stream-marker/src/main/java/addstreammarker/AddStreamMarkerAction.java'
+++ b/twitch/add-stream-marker/src/main/java/addstreammarker/AddStreamMarkerAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/add-stream-marker/src/main/java/module-info.java'
+++ b/twitch/add-stream-marker/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.addstreammar
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with addstreammarker.AddStreamMarkerAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with addstreammarker.AddStreamMarkerAction;
 }

--- 'a/twitch/clear-chat/pom.xml'
+++ b/twitch/clear-chat/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/clear-chat/src/main/java/clearchat/ClearChatAction.java'
+++ b/twitch/clear-chat/src/main/java/clearchat/ClearChatAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;
@@ -63,11 +63,13 @@ public class ClearChatAction extends Nor
     @Override
     public void onShutDown() throws Exception
     {
-        if (twirk != null) {
+        if (twirk != null)
+        {
             try
             {
                 twirk.disconnect();
-            } catch (Exception ex) {
+            } catch (Exception ex)
+            {
                 throw new StreamPiException("Twitch Connection error", "Please try again.");
             }
         }

--- 'a/twitch/clear-chat/src/main/java/module-info.java'
+++ b/twitch/clear-chat/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.clearchatact
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with clearchat.ClearChatAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with clearchat.ClearChatAction;
 }

--- 'a/twitch/host-channel/pom.xml'
+++ b/twitch/host-channel/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/host-channel/src/main/java/hostchannel/HostChannelAction.java'
+++ b/twitch/host-channel/src/main/java/hostchannel/HostChannelAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/host-channel/src/main/java/module-info.java'
+++ b/twitch/host-channel/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.hostchannela
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with hostchannel.HostChannelAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with hostchannel.HostChannelAction;
 }

--- 'a/twitch/raid-channel/pom.xml'
+++ b/twitch/raid-channel/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/raid-channel/src/main/java/module-info.java'
+++ b/twitch/raid-channel/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.raidchannela
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with raidchannel.RaidChannelAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with raidchannel.RaidChannelAction;
 }

--- 'a/twitch/raid-channel/src/main/java/raidchannel/RaidChannelAction.java'
+++ b/twitch/raid-channel/src/main/java/raidchannel/RaidChannelAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/send-channel-msg/pom.xml'
+++ b/twitch/send-channel-msg/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/send-channel-msg/src/main/java/module-info.java'
+++ b/twitch/send-channel-msg/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.sendchannelm
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with sendchannelmsg.SendChannelMessageAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with sendchannelmsg.SendChannelMessageAction;
 }

--- 'a/twitch/send-channel-msg/src/main/java/sendchannelmsg/SendChannelMessageAction.java'
+++ b/twitch/send-channel-msg/src/main/java/sendchannelmsg/SendChannelMessageAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/set-color/pom.xml'
+++ b/twitch/set-color/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/set-color/src/main/java/module-info.java'
+++ b/twitch/set-color/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.setcoloracti
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with setcolor.SetColorAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setcolor.SetColorAction;
 }

--- 'a/twitch/set-color/src/main/java/setcolor/SetColorAction.java'
+++ b/twitch/set-color/src/main/java/setcolor/SetColorAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/start-commercial/pom.xml'
+++ b/twitch/start-commercial/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/start-commercial/src/main/java/module-info.java'
+++ b/twitch/start-commercial/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.startcommerc
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with startcommercial.StartCommercialAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with startcommercial.StartCommercialAction;
 }

--- 'a/twitch/start-commercial/src/main/java/startcommercial/StartCommercialAction.java'
+++ b/twitch/start-commercial/src/main/java/startcommercial/StartCommercialAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/twitch-chat-connect/src/main/java/connect/TwitchChatConnectAction.java'
+++ b/twitch/twitch-chat-connect/src/main/java/connect/TwitchChatConnectAction.java
@@ -2,7 +2,7 @@ package connect;
 
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.alert.StreamPiAlert;
 import com.stream_pi.util.alert.StreamPiAlertType;
 import com.stream_pi.util.exception.MinorException;
@@ -29,7 +29,7 @@ public class TwitchChatConnectAction ext
 
         clearCredentialsBtn = new Button("Clear Twitch chat credentials");
         onClearCredentials();
-        setButtonBar(clearCredentialsBtn);
+        setServerSettingsButtonBar(clearCredentialsBtn);
     }
 
     @Override

--- 'a/twitch/twitch-chat-connect/src/main/java/module-info.java'
+++ b/twitch/twitch-chat-connect/src/main/java/module-info.java
@@ -7,5 +7,5 @@ module com.stream_pi.twitchchatconnectac
 
     exports connect.chat;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with connect.TwitchChatConnectAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with connect.TwitchChatConnectAction;
 }

--- 'a/twitch/unhost/pom.xml'
+++ b/twitch/unhost/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/unhost/src/main/java/module-info.java'
+++ b/twitch/unhost/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.unhostaction
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with unhost.UnhostAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with unhost.UnhostAction;
 }

--- 'a/twitch/unhost/src/main/java/unhost/UnhostAction.java'
+++ b/twitch/unhost/src/main/java/unhost/UnhostAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/unraid/pom.xml'
+++ b/twitch/unraid/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/unraid/src/main/java/module-info.java'
+++ b/twitch/unraid/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.unraidaction
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with unraid.UnraidAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with unraid.UnraidAction;
 }

--- 'a/twitch/unraid/src/main/java/unraid/UnraidAction.java'
+++ b/twitch/unraid/src/main/java/unraid/UnraidAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;

--- 'a/twitch/whisper/pom.xml'
+++ b/twitch/whisper/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <streamPiActionApiVersion>1.0.0</streamPiActionApiVersion>
-    <streamPiUtilVersion>1.0.0</streamPiUtilVersion>
+    <streamPiActionApiVersion>1.0.0-SNAPSHOT</streamPiActionApiVersion>
+    <streamPiUtilVersion>1.0.0-SNAPSHOT</streamPiUtilVersion>
     <streamPiTwitchChatConnectVersion>1.0.0</streamPiTwitchChatConnectVersion>
     <javaTwirkVersion>0.6.3</javaTwirkVersion>
   </properties>

--- 'a/twitch/whisper/src/main/java/module-info.java'
+++ b/twitch/whisper/src/main/java/module-info.java
@@ -5,5 +5,5 @@ module com.stream_pi.twitch.whisperactio
     requires com.stream_pi.twitchchatconnectaction;
     requires Java.Twirk;
 
-    provides com.stream_pi.action_api.normalaction.NormalAction with whisper.WhisperAction;
+    provides com.stream_pi.action_api.externalplugin.ExternalPlugin with whisper.WhisperAction;
 }

--- 'a/twitch/whisper/src/main/java/whisper/WhisperAction.java'
+++ b/twitch/whisper/src/main/java/whisper/WhisperAction.java
@@ -4,7 +4,7 @@ import com.gikk.twirk.Twirk;
 import com.gikk.twirk.TwirkBuilder;
 import com.stream_pi.action_api.actionproperty.property.Property;
 import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.normalaction.NormalAction;
+import com.stream_pi.action_api.externalplugin.NormalAction;
 import com.stream_pi.util.exception.StreamPiException;
 import com.stream_pi.util.version.Version;
 import connect.chat.TwitchChatCredentials;