From: EVNPC <39675973+EVNPC@users.noreply.github.com> Date: Wed, 14 Apr 2021 00:45:00 +0530 Subject: new changes --- new changes --- --- 'a/.gitignore' +++ b/.gitignore @@ -2,3 +2,4 @@ .idea/ target/ +PreBuiltPlugins/ \ No newline at end of file Binary files /dev/null and b/Dependencies/Java-Twirk-0.6.3.jar differ Binary files /dev/null and b/Dependencies/jetty-client-9.4.35.v20201120.jar differ Binary files /dev/null and b/Dependencies/jetty-http-9.4.35.v20201120.jar differ Binary files /dev/null and b/Dependencies/jetty-io-9.4.35.v20201120.jar differ Binary files /dev/null and b/Dependencies/jetty-util-9.4.35.v20201120.jar differ Binary files /dev/null and b/Dependencies/obs-websocket-java-1.2.0.jar differ Binary files /dev/null and b/Dependencies/slf4j-api-1.7.30.jar differ Binary files /dev/null and b/Dependencies/slf4j-simple-1.7.30.jar differ Binary files /dev/null and b/Dependencies/twitter4j-core-4.0.7.jar differ Binary files /dev/null and b/Dependencies/websocket-api-9.4.35.v20201120.jar differ Binary files /dev/null and b/Dependencies/websocket-client-9.4.35.v20201120.jar differ Binary files /dev/null and b/Dependencies/websocket-common-9.4.35.v20201120.jar differ --- 'a/README.md' +++ b/README.md @@ -10,56 +10,19 @@ Set of trusted, pre-bundled actions and ## List of Actions - Hotkey -- Website -- Twitter +- Media File +- Media Key - OBS Actions - Run Command - Text Block -- Media File -- Media Key -- Twitch +- Twitch Chat +- Twitter +- Website ## Actions Help Guide -### Twitch Chat Integration - -The first step is to acquire an [OAuth token](https://twitchapps.com/tmi/), the generated OAuth token should look something like `oauth:xxxxx`. - -Then in the Stream-Pi Server's Plugin page you will need to enter your Twitch username with the generated OAuth token then click on `Save Twitch Chat credentials` button. -You should then be able to use the pre-bundled Twitch chat actions. - -### Supported actions (see [Chat Commands](https://help.twitch.tv/s/article/chat-commands?language=en_US) for full documentation) - -#### All Users - -- Set username color - - Normal users can choose between Blue, Coral, DodgerBlue, SpringGreen, YellowGreen, Green, OrangeRed, Red, GoldenRod, HotPink, CadetBlue, SeaGreen, Chocolate, BlueViolet, and Firebrick. Twitch Turbo users can use any Hex value (i.e: #000000). -- Send channel message -- Whisper (send user message) - -#### Broadcaster and Mods - -- Clear chat - -#### Broadcaster and channel editors - -- Run commercial -- Host -- Unhost -- Raid -- Unraid -- Add stream marker - -#### TODO (pending [toggle-button functionality](https://github.com/stream-pi/actionapi/issues/5)) - -- Toggle slow mode -- Toggle followers-only mode -- Toggle subs-only mode -- Toggle emotes-only mode - -#### Running locally - -Copy the `Java-Twirk` and the `twitch-xxx-action` jar files from the `PreBuiltPlugins` directory to your Stream-Pi server plugins' directory. +- [Hotkey](hotkeyaction/README.md) +- [Twitch Chat](twitch/README.md) --- --- 'a/build.sh' +++ b/build.sh @@ -1,135 +1,143 @@ #!/bin/bash -FOLD=../PreBuiltPlugins +FOLD=PreBuiltPlugins +DEPS=Dependencies hotkey() { pushd . || exit - cd hotkeyaction && mvn clean package - mv target/hotkeyaction-1.0.0.jar $FOLD/hotkeyaction.jar + cd hotkeyaction && mvn clean -Dmaven.test.skip package + mv target/hotkeyaction-*.jar ../$FOLD/hotkeyaction.jar popd || exit } - - mediakey() { pushd . || exit - cd mediakeyaction && mvn clean package - mv target/mediakeyaction-1.0.0.jar $FOLD/mediakeyaction.jar + cd mediakeyaction && mvn clean -Dmaven.test.skip package + mv target/mediakeyaction-*.jar ../$FOLD/mediakeyaction.jar popd || exit } obssuite() { pushd . || exit - cd obssuite/mother && mvn clean install package - mv target/obssuite_motheraction-1.0.0.jar ../$FOLD/obssuite_motheraction.jar + cd obssuite/mother && mvn clean install -Dmaven.test.skip package + mv target/obssuite_motheraction-*.jar ../../$FOLD/obssuite_motheraction.jar - cd ../setcurrentprofile && mvn clean package - mv target/obssuite_setcurrentprofileaction-1.0.0.jar ../$FOLD/obssuite_setcurrentprofileaction.jar + cd ../setcurrentprofile && mvn clean -Dmaven.test.skip package + mv target/obssuite_setcurrentprofileaction-*.jar ../../$FOLD/obssuite_setcurrentprofileaction.jar - cd ../setcurrentscene && mvn clean package - mv target/obssuite_setcurrentsceneaction-1.0.0.jar ../$FOLD/obssuite_setcurrentsceneaction.jar + cd ../setcurrentscene && mvn clean -Dmaven.test.skip package + mv target/obssuite_setcurrentsceneaction-*.jar ../../$FOLD/obssuite_setcurrentsceneaction.jar - cd ../setcurrenttransition && mvn clean package - mv target/obssuite_setcurrenttransitionaction-1.0.0.jar ../$FOLD/obssuite_setcurrenttransitionaction.jar + cd ../setcurrenttransition && mvn clean -Dmaven.test.skip package + mv target/obssuite_setcurrenttransitionaction-*.jar ../../$FOLD/obssuite_setcurrenttransitionaction.jar - cd ../setmute && mvn clean package - mv target/obssuite_setmuteaction-1.0.0.jar ../$FOLD/obssuite_setmuteaction.jar + cd ../setmute && mvn clean -Dmaven.test.skip package + mv target/obssuite_setmuteaction-*.jar ../../$FOLD/obssuite_setmuteaction.jar - cd ../setcurrentprofile && mvn clean package - mv target/obssuite_setcurrentprofileaction-1.0.0.jar ../$FOLD/obssuite_setcurrentprofileaction.jar + cd ../setcurrentprofile && mvn clean -Dmaven.test.skip package + mv target/obssuite_setcurrentprofileaction-*.jar ../../$FOLD/obssuite_setcurrentprofileaction.jar - cd ../setpreviewscene && mvn clean package - mv target/obssuite_setpreviewsceneaction-1.0.0.jar ../$FOLD/obssuite_setpreviewsceneaction.jar + cd ../setpreviewscene && mvn clean -Dmaven.test.skip package + mv target/obssuite_setpreviewsceneaction-*.jar ../../$FOLD/obssuite_setpreviewsceneaction.jar - cd ../setrecording && mvn clean package - mv target/obssuite_setrecordingaction-1.0.0.jar ../$FOLD/obssuite_setrecordingaction.jar + cd ../setrecording && mvn clean -Dmaven.test.skip package + mv target/obssuite_setrecordingaction-*.jar ../../$FOLD/obssuite_setrecordingaction.jar - cd ../setreplaybuffer && mvn clean package - mv target/obssuite_setreplaybufferaction-1.0.0.jar ../$FOLD/obssuite_setreplaybufferaction.jar + cd ../setreplaybuffer && mvn clean -Dmaven.test.skip package + mv target/obssuite_setreplaybufferaction-*.jar ../../$FOLD/obssuite_setreplaybufferaction.jar - cd ../setstreaming && mvn clean package - mv target/obssuite_setstreamingaction-1.0.0.jar ../$FOLD/obssuite_setstreamingaction.jar + cd ../setstreaming && mvn clean -Dmaven.test.skip package + mv target/obssuite_setstreamingaction-*.jar ../../$FOLD/obssuite_setstreamingaction.jar - cd ../setstudiomode && mvn clean package - mv target/obssuite_setstudiomodeaction-1.0.0.jar ../$FOLD/obssuite_setstudiomodeaction.jar + cd ../setstudiomode && mvn clean -Dmaven.test.skip package + mv target/obssuite_setstudiomodeaction-*.jar ../../$FOLD/obssuite_setstudiomodeaction.jar - cd ../setvolume && mvn clean package - mv target/obssuite_setvolumeaction-1.0.0.jar ../$FOLD/obssuite_setvolumeaction.jar + cd ../setvolume && mvn clean -Dmaven.test.skip package + mv target/obssuite_setvolumeaction-*.jar ../../$FOLD/obssuite_setvolumeaction.jar popd || exit } playaudioclip() { pushd . || exit - cd playaudioclipaction && mvn clean package - mv target/playaudioclipaction-1.0.0.jar $FOLD/playaudioclipaction.jar + cd playaudioclipaction && mvn clean -Dmaven.test.skip package + mv target/playaudioclipaction-*.jar ../$FOLD/playaudioclipaction.jar popd || exit } runcommand() { pushd . || exit - cd runcommandaction && mvn clean package - mv target/runcommandaction-1.0.0.jar $FOLD/runcommandaction.jar + cd runcommandaction && mvn clean -Dmaven.test.skip package + mv target/runcommandaction-*.jar ../$FOLD/runcommandaction.jar popd || exit } textblock() { pushd . || exit - cd textblockaction && mvn clean package - mv target/textblockaction-1.0.0.jar $FOLD/textblockaction.jar + cd textblockaction && mvn clean -Dmaven.test.skip package + mv target/textblockaction-*.jar ../$FOLD/textblockaction.jar popd || exit } twitter() { pushd . || exit - cd twitteraction && mvn clean package - mv target/twitteraction-1.0.0.jar $FOLD/twitteraction.jar + cd twitteraction && mvn clean -Dmaven.test.skip package + mv target/twitteraction-*.jar ../$FOLD/twitteraction.jar popd || exit } twitchchat() { pushd . || exit - cd twitch/twitch-chat-connect && mvn clean install package - mv target/twitch-chat-connect-1.0.0.jar ../$FOLD/twitch-chat-connect.jar + 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 && mvn clean install package - mv target/twitch-send-channel-msg-1.0.0.jar ../$FOLD/twitch-send-channel-msg.jar + 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 && mvn clean install package - mv target/twitch-clear-chat-1.0.0.jar ../$FOLD/twitch-clear-chat.jar + cd ../clear-chat && mvn clean -Dmaven.test.skip package + mv target/twitch-clear-chat-*.jar ../../$FOLD/twitch-clear-chat.jar - cd ../set-color && mvn clean install package - mv target/twitch-set-color-1.0.0.jar ../$FOLD/twitch-set-color.jar + cd ../set-color && mvn clean -Dmaven.test.skip package + mv target/twitch-set-color-*.jar ../../$FOLD/twitch-set-color.jar - cd ../whisper && mvn clean install package - mv target/twitch-whisper-1.0.0.jar ../$FOLD/twitch-whisper.jar + cd ../whisper && mvn clean -Dmaven.test.skip package + mv target/twitch-whisper-*.jar ../../$FOLD/twitch-whisper.jar - cd ../unraid && mvn clean install package - mv target/twitch-unraid-1.0.0.jar ../$FOLD/twitch-unraid.jar + cd ../unraid && mvn clean -Dmaven.test.skip package + mv target/twitch-unraid-*.jar ../../$FOLD/twitch-unraid.jar - cd ../unhost && mvn clean install package - mv target/twitch-unhost-1.0.0.jar ../$FOLD/twitch-unhost.jar + cd ../unhost && mvn clean -Dmaven.test.skip package + mv target/twitch-unhost-*.jar ../../$FOLD/twitch-unhost.jar - cd ../add-stream-marker && mvn clean install package - mv target/twitch-add-stream-marker-1.0.0.jar ../$FOLD/twitch-add-stream-marker.jar + 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 && mvn clean install package - mv target/twitch-host-channel-1.0.0.jar ../$FOLD/twitch-host-channel.jar + cd ../host-channel && mvn clean -Dmaven.test.skip package + mv target/twitch-host-channel-*.jar ../../$FOLD/twitch-host-channel.jar - cd ../raid-channel && mvn clean install package - mv target/twitch-raid-channel-1.0.0.jar ../$FOLD/twitch-raid-channel.jar + cd ../raid-channel && mvn clean -Dmaven.test.skip package + mv target/twitch-raid-channel-*.jar ../../$FOLD/twitch-raid-channel.jar - cd ../start-commercial && mvn clean install package - mv target/twitch-start-commercial-1.0.0.jar ../$FOLD/twitch-start-commercial.jar + cd ../start-commercial && mvn clean -Dmaven.test.skip package + mv target/twitch-start-commercial-*.jar ../../$FOLD/twitch-start-commercial.jar popd || exit } -websiteaction() { +website() { pushd . || exit - cd websiteaction && mvn clean package - mv target/websiteaction-1.0.0.jar $FOLD/websiteaction.jar + cd websiteaction && mvn clean -Dmaven.test.skip package + mv target/websiteaction-*.jar ../$FOLD/websiteaction.jar popd || exit } + + + +mkdir -p $FOLD +rm -rf "${FOLD:?}/"* + +cp $DEPS/* $FOLD/ + + case "$1" in hotkey) hotkey --- /dev/null +++ b/documentopen/.gitignore @@ -0,0 +1,9 @@ +.idea/ +DemoCustomNormalAction.iml +target/ + + +.settings/ +.project +.factorypath +.classpath --- /dev/null +++ b/documentopen/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program 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. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file --- /dev/null +++ b/documentopen/pom.xml @@ -0,0 +1,89 @@ + + + 4.0.0 + + com.stream-pi + DocumentOpen + 1.0.0 + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + test-jar + package + + test-jar + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 11 + + + + + + + 1.0.0-SNAPSHOT + + 16-ea+6 + + UTF-8 + 11 + 11 + + + + + + org.openjfx + javafx-controls + ${JavaFXVersion} + + + + org.openjfx + javafx-graphics + ${JavaFXVersion} + + + + org.openjfx + javafx-base + ${JavaFXVersion} + + + + + + com.stream-pi + action-api + ${ActionAPIVersion} + + + + + + + org.kordamp.ikonli + ikonli-material-pack + 11.5.0 + + + + + + \ No newline at end of file --- /dev/null +++ b/documentopen/src/main/java/com/stream_pi/documentopen/DocumentOpen.java @@ -0,0 +1,73 @@ +package com.stream_pi.documentopen; + +import com.stream_pi.action_api.actionproperty.property.ControlType; +import com.stream_pi.action_api.actionproperty.property.FileExtensionFilter; +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.util.exception.MinorException; +import com.stream_pi.util.alert.StreamPiAlert; +import com.stream_pi.util.alert.StreamPiAlertType; +import com.stream_pi.util.version.Version; + +import java.io.File; +import java.awt.*; +import java.net.URI; + +public class DocumentOpen extends NormalAction +{ + + public DocumentOpen() + { + setName("Document Open"); + setAuthor("quimodotcom"); + setHelpLink("https://github.com/stream-pi/essentialactions"); + setVersion(new Version(1,0,0)); + + setCategory("Essential Actions"); + + } + + @Override + public void initProperties() throws Exception { + //Called First + + Property property1 = new Property("documentopen", Type.STRING); + property1.setDefaultValueStr("Document.pdf"); + property1.setControlType(ControlType.FILE_PATH); + property1.setDisplayName("Document File Location"); + property1.setExtensionFilters( + new FileExtensionFilter("pdf","*.pdf"), + new FileExtensionFilter("docx", "*.docx") + ); + + addClientProperties( + property1 + ); + } + + + @Override + public void initAction() { + + } + + public String path = null; + + @Override + public void onActionClicked() throws Exception + { + Property documentloc = getClientProperties().getSingleProperty("documentopen"); + + if (documentloc.getStringValue().isBlank()) + { + new StreamPiAlert("Document Open Action", "No file specified", StreamPiAlertType.ERROR).show(); + return; + } + + File file = new File(documentloc.getStringValue()); + + //Open PDF file + Desktop.getDesktop().open(file); + } +} --- /dev/null +++ b/documentopen/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module com.stream_pi.documentopen +{ + requires com.stream_pi.action_api; + requires org.kordamp.ikonli.javafx; + + requires java.desktop; + + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with com.stream_pi.documentopen.DocumentOpen; +} \ No newline at end of file --- 'a/hotkeyaction/README.md' +++ b/hotkeyaction/README.md @@ -1,5 +1,7 @@ # Hotkey Action plugin +![version](https://img.shields.io/badge/Version-2.0.0-green) + This plugin allows map and execute keyboard shortcuts ## KeyBoard Mapping Reference to Hotkeyaction @@ -103,16 +105,16 @@ F21 | F21 F22 | F22 | F23 | F23 | F24 | F24 | -NUMPAD 0 | 0
Ins | -NUMPAD 1 | 1
End | -NUMPAD 2 | 2
🠗 | -NUMPAD 3 | 3
PgDn | -NUMPAD 4 | 4
🠔 | -NUMPAD 5 | 5
 | -NUMPAD 6 | 6
🠖 | -NUMPAD 7 | 7
Home | -NUMPAD 8 | 8
🠕 | -NUMPAD 9 | 9
PgUp | +NUMPAD 0, NUM 0, N1 | 0
Ins | +NUMPAD 1, NUM 1, N1 | 1
End | +NUMPAD 2, NUM 2, N2 | 2
🠗 | +NUMPAD 3, NUM 3, N3 | 3
PgDn | +NUMPAD 4, NUM 4, N4 | 4
🠔 | +NUMPAD 5, NUM 5, N5 | 5
 | +NUMPAD 6, NUM 6, N6 | 6
🠖 | +NUMPAD 7, NUM 7, N7 | 7
Home | +NUMPAD 8, NUM 8, N8 | 8
🠕 | +NUMPAD 9, NUM 9, N9 | 9
PgUp | HOME | HOME | INSERT | Insert | PAGE UP | Page
Up | --- 'a/hotkeyaction/pom.xml' +++ b/hotkeyaction/pom.xml @@ -6,7 +6,7 @@ com.stream-pi hotkeyaction - 1.0.1 + 2.0.0 @@ -40,7 +40,7 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 16-ea+6 + 16 UTF-8 11 --- 'a/hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java' +++ b/hotkeyaction/src/main/java/com/stream_pi/hotkeyaction/HotkeyAction.java @@ -2,7 +2,7 @@ package com.stream_pi.hotkeyaction; 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.MinorException; import com.stream_pi.util.version.Version; @@ -23,7 +23,7 @@ public class HotkeyAction extends Normal setAuthor("rnayabed"); setServerButtonGraphic("far-keyboard"); setHelpLink("https://github.com/stream-pi/essentialactions/blob/master/hotkeyaction/README.md"); - setVersion(new Version(1,0,1)); + setVersion(new Version(2,0,0)); } @Override @@ -196,17 +196,61 @@ public class HotkeyAction extends Normal case "F23": return F23; case "F24": return F24; - case "NUMPAD 0": return NUMPAD0; - case "NUMPAD 1": return NUMPAD1; - case "NUMPAD 2": return NUMPAD2; - case "NUMPAD 3": return NUMPAD3; - case "NUMPAD 4": return NUMPAD4; - case "NUMPAD 5": return NUMPAD5; - case "NUMPAD 6": return NUMPAD6; - case "NUMPAD 7": return NUMPAD7; - case "NUMPAD 8": return NUMPAD8; - case "NUMPAD 9": return NUMPAD9; - + case "NUMPAD 0": + case "NUM 0": + case "N0": + return NUMPAD0; + + case "NUMPAD 1": + case "NUM 1": + case "N1": + return NUMPAD1; + + + case "NUMPAD 2": + case "NUM 2": + case "N2": + return NUMPAD2; + + + case "NUMPAD 3": + case "NUM 3": + case "N3": + return NUMPAD3; + + + case "NUMPAD 4": + case "NUM 4": + case "N4": + return NUMPAD4; + + + case "NUMPAD 5": + case "NUM 5": + case "N5": + return NUMPAD5; + + + case "NUMPAD 6": + case "NUM 6": + case "N6": + return NUMPAD6; + + + case "NUMPAD 7": + case "NUM 7": + case "N7": + return NUMPAD7; + + case "NUMPAD 8": + case "NUM 8": + case "N8": + return NUMPAD8; + + case "NUMPAD 9": + case "NUM 9": + case "N9": + return NUMPAD9; case "HOME": return HOME; --- 'a/hotkeyaction/src/main/java/module-info.java' +++ b/hotkeyaction/src/main/java/module-info.java @@ -8,5 +8,5 @@ module com.stream_pi.hotkeyaction requires java.desktop; - provides com.stream_pi.action_api.normalaction.NormalAction with com.stream_pi.hotkeyaction.HotkeyAction; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with com.stream_pi.hotkeyaction.HotkeyAction; } \ No newline at end of file --- 'a/mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/MediaKeyAction.java' +++ b/mediakeyaction/src/main/java/com/stream_pi/mediakeyaction/MediaKeyAction.java @@ -2,9 +2,7 @@ package com.stream_pi.mediakeyaction; 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.util.alert.StreamPiAlert; -import com.stream_pi.util.alert.StreamPiAlertType; +import com.stream_pi.action_api.externalplugin.NormalAction; import com.stream_pi.util.platform.Platform; import com.stream_pi.util.version.Version; --- 'a/mediakeyaction/src/main/java/module-info.java' +++ b/mediakeyaction/src/main/java/module-info.java @@ -8,5 +8,5 @@ module com.stream_pi.MediaKeyAction requires org.kordamp.ikonli.javafx; requires org.kordamp.ikonli.fontawesome5; - provides com.stream_pi.action_api.normalaction.NormalAction with MediaKeyAction; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with MediaKeyAction; } \ No newline at end of file --- 'a/obssuite/mother/pom.xml' +++ b/obssuite/mother/pom.xml @@ -6,7 +6,7 @@ com.stream-pi obssuite_motheraction - 1.0.0 + 1.1.0 @@ -69,7 +69,7 @@ org.eclipse.jetty.websocket websocket-client - 9.4.35.v20201120 + 9.4.39.v20210325 --- 'a/obssuite/mother/src/main/java/module-info.java' +++ b/obssuite/mother/src/main/java/module-info.java @@ -15,5 +15,5 @@ module com.stream_pi.obssuite.motheracti requires transitive com.google.gson; exports mother.motherconnection; - provides com.stream_pi.action_api.normalaction.NormalAction with mother.Mother; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with mother.Mother; } \ No newline at end of file --- 'a/obssuite/mother/src/main/java/mother/Mother.java' +++ b/obssuite/mother/src/main/java/mother/Mother.java @@ -1,8 +1,9 @@ package mother; +import com.stream_pi.action_api.actionproperty.property.ControlType; 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 com.stream_pi.util.exception.MinorException; @@ -21,24 +22,32 @@ public class Mother extends NormalAction setVisibilityInPluginsPane(false); setAuthor("rnayabed"); setHelpLink("https://github.com/Stream-Pi/EssentialActions"); - setVersion(new Version(1,0,0)); + setVersion(new Version(1,1,0)); connectDisconnectButton = new Button("Connect"); - setButtonBar(connectDisconnectButton); + setServerSettingsButtonBar(connectDisconnectButton); + } + + @Override + public void onActionClicked() + { + } private Button connectDisconnectButton; @Override - public void initProperties() throws Exception { + public void initProperties() throws Exception + { Property urlProperty = new Property("url", Type.STRING); urlProperty.setDisplayName("URL"); urlProperty.setDefaultValueStr("ws://localhost:4444"); urlProperty.setCanBeBlank(false); Property passwordProperty = new Property("pass", Type.STRING); + passwordProperty.setControlType(ControlType.TEXT_FIELD_MASKED); passwordProperty.setDisplayName("Password"); Property connectOnStartupProperty = new Property("connect_on_startup", Type.BOOLEAN); @@ -101,19 +110,13 @@ public class Mother extends NormalAction private void connect(String url, String pass) { - new Thread( - new OBSActionConnectionTask(url, pass, connectDisconnectButton) - ).start(); - } - - @Override - public void onActionClicked() throws Exception { - // TODO Auto-generated method stub - + MotherConnection.setPass(pass); + MotherConnection.setUrl(url); + new OBSActionConnectionTask(connectDisconnectButton, true); } @Override - public void onShutDown() throws Exception + public void onShutDown() { if(MotherConnection.getRemoteController() != null) { --- 'a/obssuite/mother/src/main/java/mother/OBSActionConnectionTask.java' +++ b/obssuite/mother/src/main/java/mother/OBSActionConnectionTask.java @@ -9,20 +9,31 @@ import net.twasi.obsremotejava.OBSRemote import com.stream_pi.util.alert.StreamPiAlert; import com.stream_pi.util.alert.StreamPiAlertType; -public class OBSActionConnectionTask extends Task { +public class OBSActionConnectionTask extends Task +{ String url, pass; Button connectDisconnectButton; - public OBSActionConnectionTask(String url, String pass, Button connectDisconnectButton) + public OBSActionConnectionTask(Button connectDisconnectButton, + boolean runAsync) { - this.url = url; - this.pass = pass; - this.connectDisconnectButton = connectDisconnectButton; + this.url = MotherConnection.getUrl(); + this.pass = MotherConnection.getPass(); + this.connectDisconnectButton = connectDisconnectButton; + + if(runAsync) + { + new Thread(this).start(); + } + else + { + call(); + } } @Override - protected Void call() throws Exception + protected Void call() { try { @@ -85,11 +96,17 @@ public class OBSActionConnectionTask ext private void setConnectDisconnectButtonText(String text) { + if(connectDisconnectButton == null) + return; + Platform.runLater(()-> connectDisconnectButton.setText(text)); } private void setConnectDisconnectButtonDisable(boolean disable) { + if(connectDisconnectButton == null) + return; + Platform.runLater(()-> connectDisconnectButton.setDisable(disable)); } --- 'a/obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java' +++ b/obssuite/mother/src/main/java/mother/motherconnection/MotherConnection.java @@ -3,30 +3,61 @@ package mother.motherconnection; import com.stream_pi.util.alert.StreamPiAlert; import com.stream_pi.util.alert.StreamPiAlertType; +import mother.OBSActionConnectionTask; import net.twasi.obsremotejava.OBSRemoteController; import net.twasi.obsremotejava.callbacks.Callback; -import net.twasi.obsremotejava.requests.ResponseBase; - -public class MotherConnection { +public class MotherConnection +{ private static OBSRemoteController obsRemoteController = null; - public static OBSRemoteController getRemoteController() { + private static String url = null; + private static String pass = null; + + public static void setUrl(String url) { + MotherConnection.url = url; + } + + public static void setPass(String pass) { + MotherConnection.pass = pass; + } + + public static String getUrl() { + return url; + } + + public static String getPass() { + return pass; + } + + public void connect() + { + connect(true); + } + + public void connect(boolean runAsync) + { + new OBSActionConnectionTask( null, runAsync); + } + + + public static OBSRemoteController getRemoteController() + { return obsRemoteController; } - public static void setRemoteController(OBSRemoteController obsRemoteController) { + public static void setRemoteController(OBSRemoteController obsRemoteController) + { MotherConnection.obsRemoteController = obsRemoteController; } - public static Callback getDefaultCallBack(String head, String content) { - return new Callback() { - @Override - public void run(ResponseBase response) { - if(response.getStatus().equals("error")) - { - new StreamPiAlert(head, content, StreamPiAlertType.ERROR).show(); - } + public static Callback getDefaultCallBack(String head, String content) + { + return response -> + { + if(response.getStatus().equals("error")) + { + new StreamPiAlert(head, content, StreamPiAlertType.ERROR).show(); } }; } --- 'a/obssuite/setcurrentprofile/pom.xml' +++ b/obssuite/setcurrentprofile/pom.xml @@ -39,7 +39,7 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 --- 'a/obssuite/setcurrentprofile/src/main/java/module-info.java' +++ b/obssuite/setcurrentprofile/src/main/java/module-info.java @@ -5,5 +5,5 @@ module com.stream_pi.obssuite.setcurrent requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setcurrentprofile.SetCurrentProfile; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setcurrentprofile.SetCurrentProfile; } --- 'a/obssuite/setcurrentprofile/src/main/java/setcurrentprofile/SetCurrentProfile.java' +++ b/obssuite/setcurrentprofile/src/main/java/setcurrentprofile/SetCurrentProfile.java @@ -2,7 +2,7 @@ package setcurrentprofile; 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.version.Version; --- 'a/obssuite/setcurrentscene/pom.xml' +++ b/obssuite/setcurrentscene/pom.xml @@ -39,11 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 + UTF-8 11 11 - --- 'a/obssuite/setcurrentscene/src/main/java/module-info.java' +++ b/obssuite/setcurrentscene/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setcurrent requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setcurrentscene.SetCurrentScene; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setcurrentscene.SetCurrentScene; } --- 'a/obssuite/setcurrentscene/src/main/java/setcurrentscene/SetCurrentScene.java' +++ b/obssuite/setcurrentscene/src/main/java/setcurrentscene/SetCurrentScene.java @@ -2,7 +2,7 @@ package setcurrentscene; 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.version.Version; --- 'a/obssuite/setcurrenttransition/pom.xml' +++ b/obssuite/setcurrenttransition/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setcurrenttransition/src/main/java/module-info.java' +++ b/obssuite/setcurrenttransition/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setcurrent requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setcurrenttransition.SetCurrentTransition; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setcurrenttransition.SetCurrentTransition; } --- 'a/obssuite/setcurrenttransition/src/main/java/setcurrenttransition/SetCurrentTransition.java' +++ b/obssuite/setcurrenttransition/src/main/java/setcurrenttransition/SetCurrentTransition.java @@ -2,7 +2,7 @@ package setcurrenttransition; 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.version.Version; --- 'a/obssuite/setmute/pom.xml' +++ b/obssuite/setmute/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setmute/src/main/java/module-info.java' +++ b/obssuite/setmute/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setmuteact requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setmute.SetMute; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setmute.SetMute; } --- 'a/obssuite/setmute/src/main/java/setmute/SetMute.java' +++ b/obssuite/setmute/src/main/java/setmute/SetMute.java @@ -2,7 +2,7 @@ package setmute; 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.version.Version; --- 'a/obssuite/setpreviewscene/pom.xml' +++ b/obssuite/setpreviewscene/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setpreviewscene/src/main/java/module-info.java' +++ b/obssuite/setpreviewscene/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setpreview requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setpreviewscene.SetPreviewScene; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setpreviewscene.SetPreviewScene; } --- 'a/obssuite/setpreviewscene/src/main/java/setpreviewscene/SetPreviewScene.java' +++ b/obssuite/setpreviewscene/src/main/java/setpreviewscene/SetPreviewScene.java @@ -2,7 +2,7 @@ package setpreviewscene; 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.version.Version; --- 'a/obssuite/setrecording/pom.xml' +++ b/obssuite/setrecording/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setrecording/src/main/java/module-info.java' +++ b/obssuite/setrecording/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setrecordi requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setrecording.SetRecording; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setrecording.SetRecording; } --- 'a/obssuite/setrecording/src/main/java/setrecording/SetRecording.java' +++ b/obssuite/setrecording/src/main/java/setrecording/SetRecording.java @@ -4,7 +4,7 @@ import java.util.ArrayList; 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.version.Version; --- 'a/obssuite/setreplaybuffer/pom.xml' +++ b/obssuite/setreplaybuffer/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setreplaybuffer/src/main/java/module-info.java' +++ b/obssuite/setreplaybuffer/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setreplayb requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setreplaybuffer.SetReplayBuffer; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setreplaybuffer.SetReplayBuffer; } --- 'a/obssuite/setreplaybuffer/src/main/java/setreplaybuffer/SetReplayBuffer.java' +++ b/obssuite/setreplaybuffer/src/main/java/setreplaybuffer/SetReplayBuffer.java @@ -4,7 +4,7 @@ import java.util.ArrayList; 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.version.Version; @@ -12,7 +12,8 @@ import com.stream_pi.util.version.Versio import mother.motherconnection.MotherConnection; import net.twasi.obsremotejava.OBSRemoteController; -public class SetReplayBuffer extends NormalAction { +public class SetReplayBuffer extends NormalAction +{ public SetReplayBuffer() { setName("Set Replay Buffer"); --- 'a/obssuite/setstreaming/pom.xml' +++ b/obssuite/setstreaming/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setstreaming/src/main/java/module-info.java' +++ b/obssuite/setstreaming/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setstreami requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setstreaming.SetStreaming; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setstreaming.SetStreaming; } --- 'a/obssuite/setstreaming/src/main/java/setstreaming/SetStreaming.java' +++ b/obssuite/setstreaming/src/main/java/setstreaming/SetStreaming.java @@ -4,7 +4,7 @@ import java.util.ArrayList; 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.version.Version; --- 'a/obssuite/setstudiomode/pom.xml' +++ b/obssuite/setstudiomode/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setstudiomode/src/main/java/SetStudioMode/SetStudioMode.java' +++ b/obssuite/setstudiomode/src/main/java/SetStudioMode/SetStudioMode.java @@ -2,7 +2,7 @@ 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.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.version.Version; --- 'a/obssuite/setstudiomode/src/main/java/module-info.java' +++ b/obssuite/setstudiomode/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setstudiom requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with SetStudioMode.SetStudioMode; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with SetStudioMode.SetStudioMode; } --- 'a/obssuite/setvolume/pom.xml' +++ b/obssuite/setvolume/pom.xml @@ -39,12 +39,11 @@ 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0 + 1.1.0 UTF-8 11 11 - --- 'a/obssuite/setvolume/src/main/java/module-info.java' +++ b/obssuite/setvolume/src/main/java/module-info.java @@ -6,5 +6,5 @@ module com.stream_pi.obssuite.setvolumea requires obs.websocket.java; requires com.stream_pi.obssuite.motheraction; - provides com.stream_pi.action_api.normalaction.NormalAction with setvolume.SetVolume; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with setvolume.SetVolume; } --- 'a/obssuite/setvolume/src/main/java/setvolume/SetVolume.java' +++ b/obssuite/setvolume/src/main/java/setvolume/SetVolume.java @@ -2,7 +2,7 @@ package setvolume; 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.version.Version; --- 'a/playaudioclipaction/pom.xml' +++ b/playaudioclipaction/pom.xml @@ -6,7 +6,7 @@ com.stream-pi playaudioclipaction - 1.1.0 + 2.0.0 --- 'a/playaudioclipaction/src/main/java/com/stream_pi/playaudioclipaction/PlayAudioClipAction.java' +++ b/playaudioclipaction/src/main/java/com/stream_pi/playaudioclipaction/PlayAudioClipAction.java @@ -1,17 +1,18 @@ package com.stream_pi.playaudioclipaction; +import java.util.ArrayList; + import com.stream_pi.action_api.actionproperty.property.ControlType; import com.stream_pi.action_api.actionproperty.property.FileExtensionFilter; 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.version.Version; -import javafx.scene.media.Media; -import javafx.scene.media.MediaPlayer; -import javafx.stage.FileChooser; +import javafx.application.Platform; +import javafx.scene.media.AudioClip; import java.io.File; @@ -24,12 +25,21 @@ public class PlayAudioClipAction extends setAuthor("rnayabed"); setServerButtonGraphic("fas-volume-up"); setHelpLink("https://github.com/Stream-Pi/EssentialActions"); - setVersion(new Version(1,1,0)); + setVersion(new Version(2,0,0)); + + loopState = new ArrayList<>(); + loopState.add("No"); + loopState.add("Yes"); } + private ArrayList loopState; + @Override public void initProperties() throws Exception { + Property looped = new Property("audio_clip_loop", Type.LIST); + looped.setListValue(loopState); + looped.setDisplayName("Clip Looped?"); Property audioFileLocationProperty = new Property("audio_location", Type.STRING); audioFileLocationProperty.setControlType(ControlType.FILE_PATH); audioFileLocationProperty.setDisplayName("Audio File Location"); @@ -43,32 +53,77 @@ public class PlayAudioClipAction extends new FileExtensionFilter("HLS","*.m3u8") ); - addClientProperties(audioFileLocationProperty); + addClientProperties(audioFileLocationProperty, looped); } - @Override - public void initAction() throws Exception { - } + public AudioClip mediaPlayer = null; + public String path = null; @Override - public void onActionClicked() throws Exception + public void onActionClicked() throws Exception { Property audioFileLocationProperty = getClientProperties().getSingleProperty("audio_location"); - if(audioFileLocationProperty.getStringValue().isBlank()) + if (audioFileLocationProperty.getStringValue().isBlank()) { new StreamPiAlert("Media Action", "No file specified", StreamPiAlertType.ERROR).show(); return; } - MediaPlayer mediaPlayer = new MediaPlayer(new Media(new File(audioFileLocationProperty.getStringValue()).toURI().toString())); + String state = loopState.get(getClientProperties().getSingleProperty("audio_clip_looped").getSelectedIndex()); + + if(state.equals("Yes")) + { + mediaPlayer.setCycleCount(AudioClip.INDEFINITE); + } + else if(state.equals("No")) + { + mediaPlayer.setCycleCount(0); + } + + if(mediaPlayer != null) + { + if(mediaPlayer.isPlaying()) + { + Platform.runLater(mediaPlayer::stop); + return; + } + } + + if(!audioFileLocationProperty.getStringValue().equals(path)) + { + path = audioFileLocationProperty.getStringValue(); + mediaPlayer = new AudioClip(new File(path).toURI().toString()); + } + + Platform.runLater(mediaPlayer::play); + } - mediaPlayer.setOnReady(mediaPlayer::play); + @Override + public void onShutDown() + { + shutDown(); + } + @Override + public void onActionDeleted() + { + shutDown(); } @Override - public void onShutDown() throws Exception { - // TODO Auto-generated method stub + public void onClientDisconnected() + { + shutDown(); + } + private void shutDown() + { + if(mediaPlayer != null) + { + if(mediaPlayer.isPlaying()) + Platform.runLater(mediaPlayer::stop); + } } + + } --- 'a/playaudioclipaction/src/main/java/module-info.java' +++ b/playaudioclipaction/src/main/java/module-info.java @@ -7,5 +7,5 @@ module com.stream_pi.playaudioclipaction requires org.kordamp.ikonli.javafx; requires org.kordamp.ikonli.fontawesome5; - provides com.stream_pi.action_api.normalaction.NormalAction with com.stream_pi.playaudioclipaction.PlayAudioClipAction; + provides com.stream_pi.action_api.externalplugin.ExternalPlugin with com.stream_pi.playaudioclipaction.PlayAudioClipAction; } \ No newline at end of file --- '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; --- '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 --- '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.*; --- '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 --- /dev/null +++ b/twitch/README.md @@ -0,0 +1,39 @@ +# Twitch Chat Integration + +The first step is to acquire an [OAuth token](https://twitchapps.com/tmi/), the generated OAuth token should look something like `oauth:xxxxx`. + +Then in the Stream-Pi Server's Plugin page you will need to enter your Twitch username with the generated OAuth token then click on `Save Twitch Chat credentials` button. +You should then be able to use the pre-bundled Twitch chat actions. + +## Supported actions (see [Chat Commands](https://help.twitch.tv/s/article/chat-commands?language=en_US) for full documentation) + +### All Users + +- Set username color + - Normal users can choose between Blue, Coral, DodgerBlue, SpringGreen, YellowGreen, Green, OrangeRed, Red, GoldenRod, HotPink, CadetBlue, SeaGreen, Chocolate, BlueViolet, and Firebrick. Twitch Turbo users can use any Hex value (i.e: #000000). +- Send channel message +- Whisper (send user message) + +### Broadcaster and Mods + +- Clear chat + +### Broadcaster and channel editors + +- Run commercial +- Host +- Unhost +- Raid +- Unraid +- Add stream marker + +### TODO + +- Toggle slow mode +- Toggle followers-only mode +- Toggle subs-only mode +- Toggle emotes-only mode + +## Running locally + +Copy the `Java-Twirk` and the `twitch-xxx-action` jar files from the `PreBuiltPlugins` directory to your Stream-Pi server plugins' directory. \ No newline at end of file --- 'a/twitch/add-stream-marker/pom.xml' +++ b/twitch/add-stream-marker/pom.xml @@ -11,8 +11,8 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ -1,8 +1,9 @@ package connect; +import com.stream_pi.action_api.actionproperty.property.ControlType; 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,16 +30,17 @@ public class TwitchChatConnectAction ext clearCredentialsBtn = new Button("Clear Twitch chat credentials"); onClearCredentials(); - setButtonBar(clearCredentialsBtn); + setServerSettingsButtonBar(clearCredentialsBtn); } @Override - public void initProperties() + public void initProperties() throws MinorException { Property twitchNicknameProp = new Property(NICKNAME_KEY, Type.STRING); twitchNicknameProp.setDisplayName("Twitch Username"); Property twitchAccessTokenProp = new Property(ACCESS_TOKEN_KEY, Type.STRING); + twitchAccessTokenProp.setControlType(ControlType.TEXT_FIELD_MASKED); twitchAccessTokenProp.setDisplayName("Access Token"); addServerProperties(twitchNicknameProp, twitchAccessTokenProp); --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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 @@ 11 11 - 1.0.0 - 1.0.0 + 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 1.0.0 0.6.3 --- '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; --- 'a/twitteraction/src/main/java/com/stream_pi/twitteraction/TwitterAction.java' +++ b/twitteraction/src/main/java/com/stream_pi/twitteraction/TwitterAction.java @@ -1,8 +1,9 @@ package com.stream_pi.twitteraction; +import com.stream_pi.action_api.actionproperty.property.ControlType; 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 +98,7 @@ public class TwitterAction extends Norma } }).start()); - setButtonBar(loginAsNewUserButton, logoutButton); + setServerSettingsButtonBar(loginAsNewUserButton, logoutButton); } @Override @@ -107,6 +108,7 @@ public class TwitterAction extends Norma oAuthConsumerKey.setDisplayName("API Key"); Property oAuthConsumerKeySecret = new Property("consumer_key_secret", Type.STRING); + oAuthConsumerKeySecret.setControlType(ControlType.TEXT_FIELD_MASKED); oAuthConsumerKeySecret.setDisplayName("API Key Secret"); Property oAuthAccessToken = new Property("access_token", Type.STRING); --- '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