Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

essential-actions

Clone or download

Updated build script, and added support for new api for all plugins except twitch

Download Browse
+25 −73
Debayan Sutradhar (rnayabed) 2021-04-02 21:24
Debayan Sutradhar (rnayabed) 2021-04-02 21:24
f6af85a3ec3a20e28e7e1970fd2c6605d5746c10
47d3f830186fdc7c5fe8e10ecc711678fcff7a30
git #essential-actions/f6af85a3ec3a20e28e7e1970fd2c6605d5746c10

Modified Files

List
Side by side diff
M build.sh
+18 −18
--- 'a/build.sh'
+++ b/build.sh
@@ -4,7 +4,7 @@ FOLD=../PreBuiltPlugins
hotkey() {
pushd . || exit
- cd hotkeyaction && mvn clean package
+ cd hotkeyaction && mvn clean -Dmaven.test.skip package
mv target/hotkeyaction-1.0.0.jar $FOLD/hotkeyaction.jar
popd || exit
}
@@ -13,7 +13,7 @@ hotkey() {
mediakey() {
pushd . || exit
- cd mediakeyaction && mvn clean package
+ cd mediakeyaction && mvn clean -Dmaven.test.skip package
mv target/mediakeyaction-1.0.0.jar $FOLD/mediakeyaction.jar
popd || exit
}
@@ -23,65 +23,65 @@ obssuite() {
cd obssuite/mother && mvn clean install package
mv target/obssuite_motheraction-1.0.0.jar ../$FOLD/obssuite_motheraction.jar
- cd ../setcurrentprofile && mvn clean package
+ cd ../setcurrentprofile && mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrentprofileaction-1.0.0.jar ../$FOLD/obssuite_setcurrentprofileaction.jar
- cd ../setcurrentscene && mvn clean package
+ cd ../setcurrentscene && mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrentsceneaction-1.0.0.jar ../$FOLD/obssuite_setcurrentsceneaction.jar
- cd ../setcurrenttransition && mvn clean package
+ cd ../setcurrenttransition && mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrenttransitionaction-1.0.0.jar ../$FOLD/obssuite_setcurrenttransitionaction.jar
- cd ../setmute && mvn clean package
+ cd ../setmute && mvn clean -Dmaven.test.skip package
mv target/obssuite_setmuteaction-1.0.0.jar ../$FOLD/obssuite_setmuteaction.jar
- cd ../setcurrentprofile && mvn clean package
+ cd ../setcurrentprofile && mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrentprofileaction-1.0.0.jar ../$FOLD/obssuite_setcurrentprofileaction.jar
- cd ../setpreviewscene && mvn clean package
+ cd ../setpreviewscene && mvn clean -Dmaven.test.skip package
mv target/obssuite_setpreviewsceneaction-1.0.0.jar ../$FOLD/obssuite_setpreviewsceneaction.jar
- cd ../setrecording && mvn clean package
+ cd ../setrecording && mvn clean -Dmaven.test.skip package
mv target/obssuite_setrecordingaction-1.0.0.jar ../$FOLD/obssuite_setrecordingaction.jar
- cd ../setreplaybuffer && mvn clean package
+ cd ../setreplaybuffer && mvn clean -Dmaven.test.skip package
mv target/obssuite_setreplaybufferaction-1.0.0.jar ../$FOLD/obssuite_setreplaybufferaction.jar
- cd ../setstreaming && mvn clean package
+ cd ../setstreaming && mvn clean -Dmaven.test.skip package
mv target/obssuite_setstreamingaction-1.0.0.jar ../$FOLD/obssuite_setstreamingaction.jar
- cd ../setstudiomode && mvn clean package
+ cd ../setstudiomode && mvn clean -Dmaven.test.skip package
mv target/obssuite_setstudiomodeaction-1.0.0.jar ../$FOLD/obssuite_setstudiomodeaction.jar
- cd ../setvolume && mvn clean package
+ cd ../setvolume && mvn clean -Dmaven.test.skip package
mv target/obssuite_setvolumeaction-1.0.0.jar ../$FOLD/obssuite_setvolumeaction.jar
popd || exit
}
playaudioclip() {
pushd . || exit
- cd playaudioclipaction && mvn clean package
+ cd playaudioclipaction && mvn clean -Dmaven.test.skip package
mv target/playaudioclipaction-1.0.0.jar $FOLD/playaudioclipaction.jar
popd || exit
}
runcommand() {
pushd . || exit
- cd runcommandaction && mvn clean package
+ cd runcommandaction && mvn clean -Dmaven.test.skip package
mv target/runcommandaction-1.0.0.jar $FOLD/runcommandaction.jar
popd || exit
}
textblock() {
pushd . || exit
- cd textblockaction && mvn clean package
+ cd textblockaction && mvn clean -Dmaven.test.skip package
mv target/textblockaction-1.0.0.jar $FOLD/textblockaction.jar
popd || exit
}
twitter() {
pushd . || exit
- cd twitteraction && mvn clean package
+ cd twitteraction && mvn clean -Dmaven.test.skip package
mv target/twitteraction-1.0.0.jar $FOLD/twitteraction.jar
popd || exit
}
@@ -125,7 +125,7 @@ twitchchat() {
websiteaction() {
pushd . || exit
- cd websiteaction && mvn clean package
+ cd websiteaction && mvn clean -Dmaven.test.skip package
mv target/websiteaction-1.0.0.jar $FOLD/websiteaction.jar
popd || exit
}
D runcommandaction/RunCommandAction.iml
+0 −24
--- 'a/runcommandaction/RunCommandAction.iml'
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.stream-pi:util:1.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-base:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: com.stream-pi:action-api:1.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome5-pack:11.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:11.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-javafx:11.5.0" level="project" />
- </component>
-</module>
\ No newline at end of file
M runcommandaction/src/main/java/com/stream_pi/runcommandaction/RunCommandAction.java
+1 −1
--- 'a/runcommandaction/src/main/java/com/stream_pi/runcommandaction/RunCommandAction.java'
+++ b/runcommandaction/src/main/java/com/stream_pi/runcommandaction/RunCommandAction.java
@@ -2,7 +2,7 @@ package com.stream_pi.runcommandaction;
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.version.Version;
M runcommandaction/src/main/java/module-info.java
+1 −1
--- 'a/runcommandaction/src/main/java/module-info.java'
+++ b/runcommandaction/src/main/java/module-info.java
@@ -7,6 +7,6 @@ module com.stream_pi.runcommandaction
requires org.kordamp.ikonli.javafx;
requires org.kordamp.ikonli.fontawesome5;
- provides com.stream_pi.action_api.normalaction.NormalAction with com.stream_pi.runcommandaction.RunCommandAction;
+ provides com.stream_pi.action_api.externalplugin.ExternalPlugin with com.stream_pi.runcommandaction.RunCommandAction;
}
\ No newline at end of file
D textblockaction/TextBlockAction.iml
+0 −24
--- 'a/textblockaction/TextBlockAction.iml'
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.stream-pi:util:1.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:linux:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:linux:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-base:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: org.openjfx:javafx-base:linux:16-ea+6" level="project" />
- <orderEntry type="library" name="Maven: com.stream-pi:action-api:1.0.0-SNAPSHOT" level="project" />
- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-fontawesome5-pack:11.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-core:11.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.kordamp.ikonli:ikonli-javafx:11.5.0" level="project" />
- </component>
-</module>
\ No newline at end of file
M textblockaction/src/main/java/com/stream_pi/textblockaction/TextBlockAction.java
+1 −1
--- 'a/textblockaction/src/main/java/com/stream_pi/textblockaction/TextBlockAction.java'
+++ b/textblockaction/src/main/java/com/stream_pi/textblockaction/TextBlockAction.java
@@ -2,7 +2,7 @@ package com.stream_pi.textblockaction;
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.version.Version;
import static java.awt.event.KeyEvent.*;
M textblockaction/src/main/java/module-info.java
+1 −1
--- 'a/textblockaction/src/main/java/module-info.java'
+++ b/textblockaction/src/main/java/module-info.java
@@ -9,6 +9,6 @@ module com.stream_pi.textblockaction {
requires java.desktop;
- provides com.stream_pi.action_api.normalaction.NormalAction with TextBlockAction;
+ provides com.stream_pi.action_api.externalplugin.ExternalPlugin with TextBlockAction;
}
\ No newline at end of file
M twitteraction/src/main/java/com/stream_pi/twitteraction/TwitterAction.java
+2 −2
--- 'a/twitteraction/src/main/java/com/stream_pi/twitteraction/TwitterAction.java'
+++ b/twitteraction/src/main/java/com/stream_pi/twitteraction/TwitterAction.java
@@ -2,7 +2,7 @@ package com.stream_pi.twitteraction;
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.StreamPiAlertListener;
import com.stream_pi.util.alert.StreamPiAlertType;
@@ -97,7 +97,7 @@ public class TwitterAction extends Norma
}
}).start());
- setButtonBar(loginAsNewUserButton, logoutButton);
+ setServerSettingsButtonBar(loginAsNewUserButton, logoutButton);
}
@Override
M twitteraction/src/main/java/module-info.java
+1 −1
--- 'a/twitteraction/src/main/java/module-info.java'
+++ b/twitteraction/src/main/java/module-info.java
@@ -10,5 +10,5 @@ module com.stream_pi.twitteraction {
requires java.desktop;
- provides com.stream_pi.action_api.normalaction.NormalAction with com.stream_pi.twitteraction.TwitterAction;
+ provides com.stream_pi.action_api.externalplugin.ExternalPlugin with com.stream_pi.twitteraction.TwitterAction;
}
\ No newline at end of file