essential-actions

Clone or download

Updated build.bat to work properly

Updated OBS Actions to use toggle actions

Modified Files

--- 'a/.mvn/wrapper/MavenWrapperDownloader.java'
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
- private static final String WRAPPER_VERSION = "0.5.6";
- /**
- * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
- */
- private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
- + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
- /**
- * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
- * use instead of the default one.
- */
- private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
- ".mvn/wrapper/maven-wrapper.properties";
-
- /**
- * Path where the maven-wrapper.jar will be saved to.
- */
- private static final String MAVEN_WRAPPER_JAR_PATH =
- ".mvn/wrapper/maven-wrapper.jar";
-
- /**
- * Name of the property which should be used to override the default download url for the wrapper.
- */
- private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
- public static void main(String args[]) {
- System.out.println("- Downloader started");
- File baseDirectory = new File(args[0]);
- System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
- // If the maven-wrapper.properties exists, read it and check if it contains a custom
- // wrapperUrl parameter.
- File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
- String url = DEFAULT_DOWNLOAD_URL;
- if(mavenWrapperPropertyFile.exists()) {
- FileInputStream mavenWrapperPropertyFileInputStream = null;
- try {
- mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
- Properties mavenWrapperProperties = new Properties();
- mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
- url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
- } catch (IOException e) {
- System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
- } finally {
- try {
- if(mavenWrapperPropertyFileInputStream != null) {
- mavenWrapperPropertyFileInputStream.close();
- }
- } catch (IOException e) {
- // Ignore ...
- }
- }
- }
- System.out.println("- Downloading from: " + url);
-
- File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
- if(!outputFile.getParentFile().exists()) {
- if(!outputFile.getParentFile().mkdirs()) {
- System.out.println(
- "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
- }
- }
- System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
- try {
- downloadFileFromURL(url, outputFile);
- System.out.println("Done");
- System.exit(0);
- } catch (Throwable e) {
- System.out.println("- Error downloading");
- e.printStackTrace();
- System.exit(1);
- }
- }
-
- private static void downloadFileFromURL(String urlString, File destination) throws Exception {
- if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
- String username = System.getenv("MVNW_USERNAME");
- char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
- Authenticator.setDefault(new Authenticator() {
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(username, password);
- }
- });
- }
- URL website = new URL(urlString);
- ReadableByteChannel rbc;
- rbc = Channels.newChannel(website.openStream());
- FileOutputStream fos = new FileOutputStream(destination);
- fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
- fos.close();
- rbc.close();
- }
-
-}
Binary files 'a/.mvn/wrapper/maven-wrapper.jar' and /dev/null differ
--- 'a/.mvn/wrapper/maven-wrapper.properties'
+++ /dev/null
@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
M README.md
+2 −1
--- 'a/README.md'
+++ b/README.md
@@ -1,10 +1,11 @@
# Stream-Pi Essential Actions
-Set of trusted, pre-bundled actions and integrations for Stream-Pi using the [Stream-Pi Action API](https://github.com/stream-pi/actionapi).
+Set of trusted, pre-bundled actions and integrations for Stream-Pi using the [Stream-Pi Action API](https://github.com/stream-pi/action-api).
## Prerequisites
- Java >= 11
+- Maven >= 3.6.3
## List of Actions
M build.bat
+115 −109
--- 'a/build.bat'
+++ b/build.bat
@@ -2,193 +2,199 @@
SET FOLD=PreBuiltPlugins
SET DEPS=Dependencies
-mkdir -p %FOLD%
-DEL /S "%FOLD%/"*
-COPY %DEPS%/* %FOLD%/
-
-IF "%1%"=="Hotkey" (CALL :Hotkey)
-IF "%1%"=="MediaKey" (CALL :MediaKey)
-IF "%1%"=="ObsSuite" (CALL :ObsSuite)
-IF "%1%"=="PlayAudioClip" (CALL :PlayAudioClip)
-IF "%1%"=="RunCommand" (CALL :RunCommand)
-IF "%1%"=="TextBlock" (CALL :TextBlock)
-IF "%1%"=="TwitchChat" (CALL :TwitchChat)
-IF "%1%"=="Twitter" (CALL :Twitter)
-IF "%1%"=="Website" (CALL :Website)
-IF "%1%"=="" (
- CALL :Hotkey
- CALL :MediaKey
- CALL :ObsSuite
- CALL :PlayAudioClip
- CALL :RunCommand
- CALL :TextBlock
- CALL :TwitchChat
- CALL :Twitter
- CALL :Website
+SET quit=true
+rmdir /q /s %FOLD%
+mkdir %FOLD%
+
+copy %DEPS%\* %FOLD%\
+
+if "%1%"=="Hotkey" (goto Hotkey)
+if "%1%"=="MediaKey" (goto MediaKey)
+if "%1%"=="ObsSuite" (goto ObsSuite)
+if "%1%"=="PlayAudioClip" (goto PlayAudioClip)
+if "%1%"=="RunCommand" (goto RunCommand)
+if "%1%"=="TextBlock" (goto TextBlock)
+if "%1%"=="TwitchChat" (goto TwitchChat)
+if "%1%"=="Twitter" (goto Twitter)
+if "%1%"=="Website" (goto Website)
+
+if NOT "%1%"=="" (
+ echo Invalid argument %1%
+ EXIT /B 0
)
-EXIT /B %ERRORLEVEL%
+set quit=false
+
+goto Hotkey
+goto MediaKey
+goto ObsSuite
+goto PlayAudioClip
+goto RunCommand
+goto TextBlock
+goto TwitchChat
+goto Twitter
+goto Website
:Hotkey
pushd %CD%
cd hotkeyaction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\hotkeyaction-*.jar ..\%FOLD%\hotkeyaction.jar
+call mvn clean -Dmaven.test.skip package
+move target\hotkeyaction-*.jar ..\%FOLD%\hotkeyaction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:MediaKey
pushd %CD%
cd mediakeyaction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\mediakeyaction-*.jar ..\%FOLD%\mediakeyaction.jar
+call mvn clean -Dmaven.test.skip package
+move target\mediakeyaction-*.jar ..\%FOLD%\mediakeyaction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:ObsSuite
pushd %CD%
cd obssuite\mother
-CALL ..\..\mvnw.cmd clean install -Dmaven.test.skip package
-mv target\obssuite_motheraction-*.jar ..\..\%FOLD%\obssuite_motheraction.jar
+CALL mvn clean install -Dmaven.test.skip package
+move target\obssuite_motheraction-*.jar ..\..\%FOLD%\obssuite_motheraction.jar
cd ..\setcurrentprofile
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setcurrentprofileaction-*.jar ..\..\%FOLD%\obssuite_setcurrentprofileaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setcurrentprofileaction-*.jar ..\..\%FOLD%\obssuite_setcurrentprofileaction.jar
cd ..\setcurrentscene
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setcurrentsceneaction-*.jar ..\..\%FOLD%\obssuite_setcurrentsceneaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setcurrentsceneaction-*.jar ..\..\%FOLD%\obssuite_setcurrentsceneaction.jar
cd ..\setcurrenttransition
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setcurrenttransitionaction-*.jar ..\..\%FOLD%\obssuite_setcurrenttransitionaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setcurrenttransitionaction-*.jar ..\..\%FOLD%\obssuite_setcurrenttransitionaction.jar
cd ..\setmute
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setmuteaction-*.jar ..\..\%FOLD%\obssuite_setmuteaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setmuteaction-*.jar ..\..\%FOLD%\obssuite_setmuteaction.jar
cd ..\setcurrentprofile
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setcurrentprofileaction-*.jar ..\..\%FOLD%\obssuite_setcurrentprofileaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setcurrentprofileaction-*.jar ..\..\%FOLD%\obssuite_setcurrentprofileaction.jar
cd ..\setpreviewscene
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setpreviewsceneaction-*.jar ..\..\%FOLD%\obssuite_setpreviewsceneaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setpreviewsceneaction-*.jar ..\..\%FOLD%\obssuite_setpreviewsceneaction.jar
cd ..\setrecording
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setrecordingaction-*.jar ..\..\%FOLD%\obssuite_setrecordingaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setrecordingaction-*.jar ..\..\%FOLD%\obssuite_setrecordingaction.jar
cd ..\setreplaybuffer
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setreplaybufferaction-*.jar ..\..\%FOLD%\obssuite_setreplaybufferaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setreplaybufferaction-*.jar ..\..\%FOLD%\obssuite_setreplaybufferaction.jar
cd ..\setstreaming
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setstreamingaction-*.jar ..\..\%FOLD%\obssuite_setstreamingaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setstreamingaction-*.jar ..\..\%FOLD%\obssuite_setstreamingaction.jar
cd ..\setstudiomode
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setstudiomodeaction-*.jar ..\..\%FOLD%\obssuite_setstudiomodeaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setstudiomodeaction-*.jar ..\..\%FOLD%\obssuite_setstudiomodeaction.jar
cd ..\setvolume
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\obssuite_setvolumeaction-*.jar ..\..\%FOLD%\obssuite_setvolumeaction.jar
+CALL mvn clean -Dmaven.test.skip package
+move target\obssuite_setvolumeaction-*.jar ..\..\%FOLD%\obssuite_setvolumeaction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:PlayAudioClip
pushd %CD%
cd playaudioclipaction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\playaudioclipaction-*.jar ..\..\%FOLD%\playaudioclipaction.jar
+call mvn clean -Dmaven.test.skip package
+move target\playaudioclipaction-*.jar ..\%FOLD%\playaudioclipaction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:RunCommand
pushd %CD%
cd runcommandaction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\runcommandaction-*.jar ..\..\%FOLD%\runcommandaction.jar
+call mvn clean -Dmaven.test.skip package
+move target\runcommandaction-*.jar ..\%FOLD%\runcommandaction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:TextBlock
pushd %CD%
cd textblockaction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\textblockaction-*.jar ..\..\%FOLD%\textblockaction.jar
+call mvn clean -Dmaven.test.skip package
+move target\textblockaction-*.jar ..\%FOLD%\textblockaction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:TwitchChat
pushd %CD%
cd twitch\twitch-chat-connect
-CALL ..\..\mvnw.cmd clean install -Dmaven.test.skip package
-mv target\twitch-chat-connect-*.jar ..\..\%FOLD%\twitch-chat-connect.jar
+CALL mvn clean install -Dmaven.test.skip package
+move target\twitch-chat-connect-*.jar ..\..\%FOLD%\twitch-chat-connect.jar
-cd %CD%.\send-channel-msg
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-send-channel-msg-*.jar ..\..\%FOLD%\twitch-send-channel-msg.jar
-
-cd %CD%.\clear-chat
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-clear-chat-*.jar ..\..\%FOLD%\twitch-clear-chat.jar
-
-cd %CD%.\set-color
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-set-color-*.jar ..\..\%FOLD%\twitch-set-color.jar
-
-cd %CD%.\whisper
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-whisper-*.jar ..\..\%FOLD%\twitch-whisper.jar
-
-cd %CD%.\unraid
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-unraid-*.jar ..\..\%FOLD%\twitch-unraid.jar
-
-cd %CD%.\unhost
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-unhost-*.jar ..\..\%FOLD%\twitch-unhost.jar
-
-cd %CD%.\add-stream-marker
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-add-stream-marker-*.jar ..\..\%FOLD%\twitch-add-stream-marker.jar
-
-cd %CD%.\host-channel
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-host-channel-*.jar ..\..\%FOLD%\twitch-host-channel.jar
-
-cd %CD%.\raid-channel
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-raid-channel-*.jar ..\..\%FOLD%\twitch-raid-channel.jar
-
-cd %CD%.\start-commercial
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-start-commercial-*.jar ..\..\%FOLD%\twitch-start-commercial.jar
-
-cd %CD%.\subs-only
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-subs-only-*.jar ..\..\%FOLD%\twitch-subs-only.jar
-
-cd %CD%.\slow-mode
-CALL ..\..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitch-slow-mode-*.jar ..\..\%FOLD%\twitch-slow-mode.jar
+cd ..\send-channel-msg
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-send-channel-msg-*.jar ..\..\%FOLD%\twitch-send-channel-msg.jar
+
+cd ..\clear-chat
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-clear-chat-*.jar ..\..\%FOLD%\twitch-clear-chat.jar
+
+cd ..\set-color
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-set-color-*.jar ..\..\%FOLD%\twitch-set-color.jar
+
+cd ..\whisper
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-whisper-*.jar ..\..\%FOLD%\twitch-whisper.jar
+
+cd ..\unraid
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-unraid-*.jar ..\..\%FOLD%\twitch-unraid.jar
+
+cd ..\unhost
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-unhost-*.jar ..\..\%FOLD%\twitch-unhost.jar
+
+cd ..\add-stream-marker
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-add-stream-marker-*.jar ..\..\%FOLD%\twitch-add-stream-marker.jar
+
+cd ..\host-channel
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-host-channel-*.jar ..\..\%FOLD%\twitch-host-channel.jar
+
+cd ..\raid-channel
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-raid-channel-*.jar ..\..\%FOLD%\twitch-raid-channel.jar
+
+cd ..\start-commercial
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-start-commercial-*.jar ..\..\%FOLD%\twitch-start-commercial.jar
+
+cd ..\subs-only
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-subs-only-*.jar ..\..\%FOLD%\twitch-subs-only.jar
+
+cd ..\slow-mode
+CALL mvn clean -Dmaven.test.skip package
+move target\twitch-slow-mode-*.jar ..\..\%FOLD%\twitch-slow-mode.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:Twitter
pushd %CD%
cd twitteraction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\twitteraction-*.jar ..\..\%FOLD%\twitteraction.jar
+call mvn clean -Dmaven.test.skip package
+move target\twitteraction-*.jar ..\%FOLD%\twitteraction.jar
popd
-EXIT /B 0
+if "%quit%" == "true" (EXIT /B 0)
:Website
pushd %CD%
cd websiteaction
-CALL ..\mvnw.cmd clean -Dmaven.test.skip package
-mv target\websiteaction-*.jar ..\..\%FOLD%\websiteaction.jar
+call mvn clean -Dmaven.test.skip package
+move target\websiteaction-*.jar ..\%FOLD%\websiteaction.jar
popd
-EXIT /B 0
\ No newline at end of file
+if "%quit%" == "true" (EXIT /B 0)
\ No newline at end of file
M build.sh
+32 −32
--- 'a/build.sh'
+++ b/build.sh
@@ -5,118 +5,118 @@ DEPS=Dependencies
hotkey() {
pushd . || exit
- cd hotkeyaction && ../mvnw clean -Dmaven.test.skip package
+ cd hotkeyaction && mvn clean -Dmaven.test.skip package
mv target/hotkeyaction-*.jar ../$FOLD/hotkeyaction.jar
popd || exit
}
media_key() {
pushd . || exit
- cd mediakeyaction && ../mvnw clean -Dmaven.test.skip package
+ cd mediakeyaction && mvn clean -Dmaven.test.skip package
mv target/mediakeyaction-*.jar ../$FOLD/mediakeyaction.jar
popd || exit
}
obs_suite() {
pushd . || exit
- cd obssuite/mother && ../../mvnw clean install -Dmaven.test.skip package
+ cd obssuite/mother && ../mvn clean install -Dmaven.test.skip package
mv target/obssuite_motheraction-*.jar ../../$FOLD/obssuite_motheraction.jar
- cd ../setcurrentprofile && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setcurrentprofile && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrentprofileaction-*.jar ../../$FOLD/obssuite_setcurrentprofileaction.jar
- cd ../setcurrentscene && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setcurrentscene && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrentsceneaction-*.jar ../../$FOLD/obssuite_setcurrentsceneaction.jar
- cd ../setcurrenttransition && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setcurrenttransition && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrenttransitionaction-*.jar ../../$FOLD/obssuite_setcurrenttransitionaction.jar
- cd ../setmute && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setmute && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setmuteaction-*.jar ../../$FOLD/obssuite_setmuteaction.jar
- cd ../setcurrentprofile && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setcurrentprofile && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setcurrentprofileaction-*.jar ../../$FOLD/obssuite_setcurrentprofileaction.jar
- cd ../setpreviewscene && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setpreviewscene && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setpreviewsceneaction-*.jar ../../$FOLD/obssuite_setpreviewsceneaction.jar
- cd ../setrecording && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setrecording && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setrecordingaction-*.jar ../../$FOLD/obssuite_setrecordingaction.jar
- cd ../setreplaybuffer && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setreplaybuffer && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setreplaybufferaction-*.jar ../../$FOLD/obssuite_setreplaybufferaction.jar
- cd ../setstreaming && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setstreaming && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setstreamingaction-*.jar ../../$FOLD/obssuite_setstreamingaction.jar
- cd ../setstudiomode && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setstudiomode && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setstudiomodeaction-*.jar ../../$FOLD/obssuite_setstudiomodeaction.jar
- cd ../setvolume && ../../mvnw clean -Dmaven.test.skip package
+ cd ../setvolume && ../mvn clean -Dmaven.test.skip package
mv target/obssuite_setvolumeaction-*.jar ../../$FOLD/obssuite_setvolumeaction.jar
popd || exit
}
play_audio_clip() {
pushd . || exit
- cd playaudioclipaction && ../mvnw clean -Dmaven.test.skip package
+ cd playaudioclipaction && mvn clean -Dmaven.test.skip package
mv target/playaudioclipaction-*.jar ../$FOLD/playaudioclipaction.jar
popd || exit
}
run_command() {
pushd . || exit
- cd runcommandaction && ../mvnw clean -Dmaven.test.skip package
+ cd runcommandaction && mvn clean -Dmaven.test.skip package
mv target/runcommandaction-*.jar ../$FOLD/runcommandaction.jar
popd || exit
}
text_block() {
pushd . || exit
- cd textblockaction && ../mvnw clean -Dmaven.test.skip package
+ cd textblockaction && mvn clean -Dmaven.test.skip package
mv target/textblockaction-*.jar ../$FOLD/textblockaction.jar
popd || exit
}
twitch_chat() {
pushd . || exit
- cd twitch/twitch-chat-connect && ../../mvnw clean install -Dmaven.test.skip package
+ cd twitch/twitch-chat-connect && ../mvn clean install -Dmaven.test.skip package
mv target/twitch-chat-connect-*.jar ../../$FOLD/twitch-chat-connect.jar
- cd ../send-channel-msg && ../../mvnw clean -Dmaven.test.skip package
+ cd ../send-channel-msg && ../mvn clean -Dmaven.test.skip package
mv target/twitch-send-channel-msg-*.jar ../../$FOLD/twitch-send-channel-msg.jar
- cd ../clear-chat && ../../mvnw clean -Dmaven.test.skip package
+ cd ../clear-chat && ../mvn clean -Dmaven.test.skip package
mv target/twitch-clear-chat-*.jar ../../$FOLD/twitch-clear-chat.jar
- cd ../set-color && ../../mvnw clean -Dmaven.test.skip package
+ cd ../set-color && ../mvn clean -Dmaven.test.skip package
mv target/twitch-set-color-*.jar ../../$FOLD/twitch-set-color.jar
- cd ../whisper && ../../mvnw clean -Dmaven.test.skip package
+ cd ../whisper && ../mvn clean -Dmaven.test.skip package
mv target/twitch-whisper-*.jar ../../$FOLD/twitch-whisper.jar
- cd ../unraid && ../../mvnw clean -Dmaven.test.skip package
+ cd ../unraid && ../mvn clean -Dmaven.test.skip package
mv target/twitch-unraid-*.jar ../../$FOLD/twitch-unraid.jar
- cd ../unhost && ../../mvnw clean -Dmaven.test.skip package
+ cd ../unhost && ../mvn clean -Dmaven.test.skip package
mv target/twitch-unhost-*.jar ../../$FOLD/twitch-unhost.jar
- cd ../add-stream-marker && ../../mvnw clean -Dmaven.test.skip package
+ cd ../add-stream-marker && ../mvn clean -Dmaven.test.skip package
mv target/twitch-add-stream-marker-*.jar ../../$FOLD/twitch-add-stream-marker.jar
- cd ../host-channel && ../../mvnw clean -Dmaven.test.skip package
+ cd ../host-channel && ../mvn clean -Dmaven.test.skip package
mv target/twitch-host-channel-*.jar ../../$FOLD/twitch-host-channel.jar
- cd ../raid-channel && ../../mvnw clean -Dmaven.test.skip package
+ cd ../raid-channel && ../mvn clean -Dmaven.test.skip package
mv target/twitch-raid-channel-*.jar ../../$FOLD/twitch-raid-channel.jar
- cd ../start-commercial && ../../mvnw clean -Dmaven.test.skip package
+ cd ../start-commercial && ../mvn clean -Dmaven.test.skip package
mv target/twitch-start-commercial-*.jar ../../$FOLD/twitch-start-commercial.jar
- cd ../subs-only && ../../mvnw clean -Dmaven.test.skip package
+ cd ../subs-only && ../mvn clean -Dmaven.test.skip package
mv target/twitch-subs-only-*.jar ../../$FOLD/twitch-subs-only.jar
- cd ../slow-mode && ../../mvnw clean -Dmaven.test.skip package
+ cd ../slow-mode && ../mvn clean -Dmaven.test.skip package
mv target/twitch-slow-mode-*.jar ../../$FOLD/twitch-slow-mode.jar
popd || exit
@@ -124,14 +124,14 @@ twitch_chat() {
twitter() {
pushd . || exit
- cd twitteraction && ../mvnw clean -Dmaven.test.skip package
+ cd twitteraction && mvn clean -Dmaven.test.skip package
mv target/twitteraction-*.jar ../$FOLD/twitteraction.jar
popd || exit
}
website() {
pushd . || exit
- cd websiteaction && ../mvnw clean -Dmaven.test.skip package
+ cd websiteaction && mvn clean -Dmaven.test.skip package
mv target/websiteaction-*.jar ../$FOLD/websiteaction.jar
popd || exit
}
D mvnw
+0 −310
--- 'a/mvnw'
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-# M2_HOME - location of maven2's installed home dir
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
- if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
- fi
-
- if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
- fi
-
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- MINGW*) mingw=true;;
- Darwin*) darwin=true
- # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- export JAVA_HOME="`/usr/libexec/java_home`"
- else
- export JAVA_HOME="/Library/Java/Home"
- fi
- fi
- ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
- fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
-
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
- done
-
- saveddir=`pwd`
-
- M2_HOME=`dirname "$PRG"`/..
-
- # make it fully qualified
- M2_HOME=`cd "$M2_HOME" && pwd`
-
- cd "$saveddir"
- # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --unix "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME="`(cd "$M2_HOME"; pwd)`"
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
- javaExecutable="`which javac`"
- if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
- # readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
- if $darwin ; then
- javaHome="`dirname \"$javaExecutable\"`"
- javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
- else
- javaExecutable="`readlink -f \"$javaExecutable\"`"
- fi
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
- JAVA_HOME="$javaHome"
- export JAVA_HOME
- fi
- fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD="`which java`"
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly." >&2
- echo " We cannot execute $JAVACMD" >&2
- exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
- if [ -z "$1" ]
- then
- echo "Path not specified to find_maven_basedir"
- return 1
- fi
-
- basedir="$1"
- wdir="$1"
- while [ "$wdir" != '/' ] ; do
- if [ -d "$wdir"/.mvn ] ; then
- basedir=$wdir
- break
- fi
- # workaround for JBEAP-8937 (on Solaris 10/Sparc)
- if [ -d "${wdir}" ]; then
- wdir=`cd "$wdir/.."; pwd`
- fi
- # end of workaround
- done
- echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
- if [ -f "$1" ]; then
- echo "$(tr -s '\n' ' ' < "$1")"
- fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
- exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found .mvn/wrapper/maven-wrapper.jar"
- fi
-else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
- fi
- if [ -n "$MVNW_REPOURL" ]; then
- jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
- else
- jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
- fi
- while IFS="=" read key value; do
- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
- esac
- done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Downloading from: $jarUrl"
- fi
- wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
- if $cygwin; then
- wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
- fi
-
- if command -v wget > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found wget ... using wget"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget "$jarUrl" -O "$wrapperJarPath"
- else
- wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
- fi
- elif command -v curl > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found curl ... using curl"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl -o "$wrapperJarPath" "$jarUrl" -f
- else
- curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
- fi
-
- else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Falling back to using Java to download"
- fi
- javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaClass=`cygpath --path --windows "$javaClass"`
- fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Compiling MavenWrapperDownloader.java ..."
- fi
- # Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
- fi
- if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- # Running the downloader
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Running MavenWrapperDownloader.java ..."
- fi
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
- fi
- fi
- fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
- echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
- MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
- $MAVEN_OPTS \
- -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
- "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
- ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
D mvnw.cmd
+0 −182
--- 'a/mvnw.cmd'
+++ /dev/null
@@ -1,182 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
- if "%MVNW_VERBOSE%" == "true" (
- echo Found %WRAPPER_JAR%
- )
-) else (
- if not "%MVNW_REPOURL%" == "" (
- SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
- )
- if "%MVNW_VERBOSE%" == "true" (
- echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %DOWNLOAD_URL%
- )
-
- powershell -Command "&{"^
- "$webclient = new-object System.Net.WebClient;"^
- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
- "}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
- "}"
- if "%MVNW_VERBOSE%" == "true" (
- echo Finished downloading %WRAPPER_JAR%
- )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
--- 'a/obssuite/setreplaybuffer/pom.xml'
+++ b/obssuite/setreplaybuffer/pom.xml
@@ -39,7 +39,7 @@
<properties>
<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>
<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>
- <OBSSuiteMotherVersion>1.1.0</OBSSuiteMotherVersion>
+ <OBSSuiteMotherVersion>2.0.0</OBSSuiteMotherVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
--- /dev/null
+++ b/obssuite/setreplaybuffer/src/main/java/setreplaybuffer/ReplayBufferState.java
@@ -0,0 +1,6 @@
+package setreplaybuffer;
+
+public enum ReplayBufferState
+{
+ START, STOP, SAVE
+}
--- 'a/obssuite/setreplaybuffer/src/main/java/setreplaybuffer/SetReplayBuffer.java'
+++ b/obssuite/setreplaybuffer/src/main/java/setreplaybuffer/SetReplayBuffer.java
@@ -15,12 +15,13 @@ import net.twasi.obsremotejava.OBSRemote
public class SetReplayBuffer extends NormalAction
{
- public SetReplayBuffer() {
+ public SetReplayBuffer()
+ {
setName("Set Replay Buffer");
setCategory("OBS");
setVisibilityInServerSettingsPane(false);
setAuthor("rnayabed");
- setVersion(new Version(1, 0, 0));
+ setVersion(MotherConnection.VERSION);
states = new ArrayList<>();
states.add("Start");
--- 'a/obssuite/setstreaming/pom.xml'
+++ b/obssuite/setstreaming/pom.xml
@@ -39,7 +39,7 @@
<properties>
<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>
<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>
- <OBSSuiteMotherVersion>1.1.0</OBSSuiteMotherVersion>
+ <OBSSuiteMotherVersion>2.0.0</OBSSuiteMotherVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
--- 'a/obssuite/setstreaming/src/main/java/setstreaming/SetStreaming.java'
+++ b/obssuite/setstreaming/src/main/java/setstreaming/SetStreaming.java
@@ -2,76 +2,111 @@ package setstreaming;
import java.util.ArrayList;
+import com.stream_pi.action_api.actionproperty.property.BooleanProperty;
import com.stream_pi.action_api.actionproperty.property.Property;
import com.stream_pi.action_api.actionproperty.property.Type;
import com.stream_pi.action_api.externalplugin.NormalAction;
+import com.stream_pi.action_api.externalplugin.ToggleAction;
import com.stream_pi.util.alert.StreamPiAlert;
import com.stream_pi.util.alert.StreamPiAlertType;
+import com.stream_pi.util.exception.MinorException;
import com.stream_pi.util.version.Version;
import mother.motherconnection.MotherConnection;
import net.twasi.obsremotejava.OBSRemoteController;
-public class SetStreaming extends NormalAction {
+public class SetStreaming extends ToggleAction
+{
- public SetStreaming() {
+ public SetStreaming()
+ {
setName("Set Streaming");
setCategory("OBS");
setVisibilityInServerSettingsPane(false);
setAuthor("rnayabed");
- setVersion(new Version(1, 0, 0));
-
- states = new ArrayList<>();
- states.add("Start");
- states.add("Stop");
+ setVersion(MotherConnection.VERSION);
}
- private ArrayList<String> states;
-
@Override
- public void initProperties() throws Exception {
+ public void initProperties() throws Exception
+ {
+ BooleanProperty autoConnectProperty = new BooleanProperty("auto_connect");
+ autoConnectProperty.setDefaultValueBoolean(true);
+ autoConnectProperty.setDisplayName("Auto Connect if not connected");
- Property streamingStatusProperty = new Property("streaming_status", Type.LIST);
- streamingStatusProperty.setListValue(states);
- streamingStatusProperty.setDisplayName("Streaming State");
-
- addClientProperties(streamingStatusProperty);
+ addClientProperties(autoConnectProperty);
}
@Override
- public void initAction() throws Exception {
- // TODO Auto-generated method stub
+ public void onToggleOn() throws Exception
+ {
+ onClicked(true);
}
@Override
- public void onActionClicked() throws Exception {
- // TODO Auto-generated method stub
-
- OBSRemoteController controller = MotherConnection.getRemoteController();
+ public void onToggleOff() throws Exception
+ {
+ onClicked(false);
+ }
- if (controller == null) {
- new StreamPiAlert("Is OBS Connected?",
- "It seems there is no connection to OBS, please connect it in Settings", StreamPiAlertType.WARNING)
- .show();
- } else {
-
- String state = states.get(getClientProperties().getSingleProperty("streaming_status").getSelectedIndex());
+ public void onClicked(boolean streaming) throws MinorException
+ {
+ if (MotherConnection.getRemoteController() == null)
+ {
+ boolean autoConnect = getClientProperties().getSingleProperty(
+ "auto_connect"
+ ).getBoolValue();
- if(state.equals("Start"))
+ if(autoConnect)
{
- controller.startStreaming(MotherConnection.getDefaultCallBack("Failed to Start Streaming","Failed to do that"));
+ MotherConnection.connect(()->setStreaming(streaming));
}
- else if(state.equals("Stop"))
+ else
{
- controller.stopStreaming(MotherConnection.getDefaultCallBack("Failed to Stop Streaming","Failed to do that"));
+ MotherConnection.showOBSNotRunningError();
}
}
+ else
+ {
+ setStreaming(streaming);
+ }
}
- @Override
- public void onShutDown() throws Exception {
- // TODO Auto-generated method stub
+
+ public void setStreaming(boolean enabled)
+ {
+ if(enabled)
+ {
+ MotherConnection.getRemoteController().startStreaming(startStreamingResponse -> {
+ String status = startStreamingResponse.getStatus();
+ String error = startStreamingResponse.getError();
+
+ if(status.equals("error"))
+ {
+ String content;
+
+ content = error;
+
+ new StreamPiAlert("OBS",content, StreamPiAlertType.ERROR).show();
+ }
+ });
+ }
+ else
+ {
+ MotherConnection.getRemoteController().stopStreaming(stopStreamingResponse -> {
+ String status = stopStreamingResponse.getStatus();
+ String error = stopStreamingResponse.getError();
+
+ if(status.equals("error"))
+ {
+ String content;
+
+ content = error;
+
+ new StreamPiAlert("OBS",content, StreamPiAlertType.ERROR).show();
+ }
+ });
+ }
}
-
}
--- 'a/obssuite/setstudiomode/pom.xml'
+++ b/obssuite/setstudiomode/pom.xml
@@ -39,7 +39,7 @@
<properties>
<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>
<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>
- <OBSSuiteMotherVersion>1.1.0</OBSSuiteMotherVersion>
+ <OBSSuiteMotherVersion>2.0.0</OBSSuiteMotherVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
--- 'a/obssuite/setstudiomode/src/main/java/SetStudioMode/SetStudioMode.java'
+++ b/obssuite/setstudiomode/src/main/java/SetStudioMode/SetStudioMode.java
@@ -2,60 +2,87 @@ package SetStudioMode;
import com.stream_pi.action_api.actionproperty.property.Property;
import com.stream_pi.action_api.actionproperty.property.Type;
-import com.stream_pi.action_api.externalplugin.NormalAction;
+import com.stream_pi.action_api.externalplugin.ToggleAction;
import com.stream_pi.util.alert.StreamPiAlert;
import com.stream_pi.util.alert.StreamPiAlertType;
+import com.stream_pi.util.exception.MinorException;
import com.stream_pi.util.version.Version;
import mother.motherconnection.MotherConnection;
-import net.twasi.obsremotejava.OBSRemoteController;
-public class SetStudioMode extends NormalAction {
+public class SetStudioMode extends ToggleAction
+{
- public SetStudioMode() {
+ public SetStudioMode()
+ {
setName("Set Studio Mode");
setCategory("OBS");
setVisibilityInServerSettingsPane(false);
setAuthor("rnayabed");
- setVersion(new Version(1, 0, 0));
+ setVersion(MotherConnection.VERSION);
}
@Override
- public void initProperties() throws Exception {
+ public void initProperties() throws Exception
+ {
+ Property autoConnectProperty = new Property("auto_connect", Type.BOOLEAN);
+ autoConnectProperty.setDefaultValueBoolean(true);
+ autoConnectProperty.setDisplayName("Auto Connect if not connected");
- Property studioModeStatusProperty = new Property("studio_mode_status", Type.BOOLEAN);
- studioModeStatusProperty.setDisplayName("Studio Mode");
-
- addClientProperties(studioModeStatusProperty);
+ addClientProperties(autoConnectProperty);
}
@Override
- public void initAction() throws Exception {
- // TODO Auto-generated method stub
+ public void onToggleOn() throws Exception
+ {
+ onClicked(true);
}
@Override
- public void onActionClicked() throws Exception {
- // TODO Auto-generated method stub
-
- OBSRemoteController controller = MotherConnection.getRemoteController();
+ public void onToggleOff() throws Exception
+ {
+ onClicked(false);
+ }
- if (controller == null) {
- new StreamPiAlert("Is OBS Connected?",
- "It seems there is no connection to OBS, please connect it in Settings", StreamPiAlertType.WARNING)
- .show();
- } else
+ public void onClicked(boolean studioMode) throws MinorException
+ {
+ if (MotherConnection.getRemoteController() == null)
{
- controller.setStudioModeEnabled(getClientProperties().getSingleProperty("studio_mode_status").getBoolValue(),
- MotherConnection.getDefaultCallBack("Failed to set studio mode","Failed to do that"));
-
+ boolean autoConnect = getClientProperties().getSingleProperty(
+ "auto_connect"
+ ).getBoolValue();
+
+ if(autoConnect)
+ {
+ MotherConnection.connect(()->setStudioMode(studioMode));
+ }
+ else
+ {
+ MotherConnection.showOBSNotRunningError();
+ }
+ }
+ else
+ {
+ setStudioMode(studioMode);
}
}
- @Override
- public void onShutDown() throws Exception {
- // TODO Auto-generated method stub
+ public void setStudioMode(boolean enabled)
+ {
+ MotherConnection.getRemoteController().setStudioModeEnabled(enabled, setStudioModeEnabledResponse -> {
+ String status = setStudioModeEnabledResponse.getStatus();
+ String error = setStudioModeEnabledResponse.getError();
+
+ if(status.equals("error"))
+ {
+ String content;
+
+ content = error;
+
+ new StreamPiAlert("OBS",content, StreamPiAlertType.ERROR).show();
+ }
+ });
}
}
--- 'a/obssuite/setvolume/pom.xml'
+++ b/obssuite/setvolume/pom.xml
@@ -39,7 +39,7 @@
<properties>
<ActionAPIVersion>1.0.0-SNAPSHOT</ActionAPIVersion>
<UtilVersion>1.0.0-SNAPSHOT</UtilVersion>
- <OBSSuiteMotherVersion>1.1.0</OBSSuiteMotherVersion>
+ <OBSSuiteMotherVersion>2.0.0</OBSSuiteMotherVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
--- 'a/obssuite/setvolume/src/main/java/setvolume/SetVolume.java'
+++ b/obssuite/setvolume/src/main/java/setvolume/SetVolume.java
@@ -17,7 +17,7 @@ public class SetVolume extends NormalAct
setCategory("OBS");
setVisibilityInServerSettingsPane(false);
setAuthor("rnayabed");
- setVersion(new Version(1, 0, 0));
+ setVersion(MotherConnection.VERSION);
}
@Override
@@ -43,7 +43,8 @@ public class SetVolume extends NormalAct
OBSRemoteController controller = MotherConnection.getRemoteController();
- if (controller == null) {
+ if (controller == null)
+ {
new StreamPiAlert("Is OBS Connected?",
"It seems there is no connection to OBS, please connect it in Settings", StreamPiAlertType.WARNING)
.show();