From c8da140a04e4ba2bfb497137178b9bab897eb8bb Mon Sep 17 00:00:00 2001 From: overflowerror Date: Thu, 8 Sep 2016 00:21:46 +0200 Subject: [PATCH] new concept and first working version --- LICENSE | 674 ------------------ pom.xml | 13 - .../java/net/persei/dionysus/AudioPlayer.java | 45 -- src/main/java/net/persei/dionysus/Data.java | 24 - src/main/java/net/persei/dionysus/Main.java | 84 ++- .../java/net/persei/dionysus/MidiTrigger.java | 5 - src/main/java/net/persei/dionysus/Player.java | 13 - .../java/net/persei/dionysus/PlayerGUI.java | 79 -- src/main/java/net/persei/dionysus/Setup.java | 47 -- .../net/persei/dionysus/blocks/Block.java | 31 - .../dionysus/blocks/BlockCondition.java | 112 --- .../persei/dionysus/blocks/BlockHelper.java | 22 - .../net/persei/dionysus/blocks/BlockType.java | 8 - .../dionysus/blocks/ConditionalBlock.java | 5 - .../persei/dionysus/blocks/DelayBlock.java | 30 - .../persei/dionysus/blocks/IfElseBlock.java | 26 - .../persei/dionysus/blocks/InitialBlock.java | 25 - .../java/net/persei/dionysus/blocks/Lane.java | 43 -- .../dionysus/blocks/MultiThreadBlock.java | 45 -- .../persei/dionysus/blocks/SetDataBlock.java | 34 - .../persei/dionysus/blocks/SetStateBlock.java | 31 - .../persei/dionysus/blocks/SplitterBlock.java | 26 - .../dionysus/controlroom/Clickable.java | 7 - .../controlroom/ControlPanelBlock.java | 9 - .../controlroom/ControlPanelComponent.java | 9 - .../dionysus/controlroom/ControlRoom.java | 49 -- .../persei/dionysus/controlroom/Drawable.java | 7 - .../persei/dionysus/controlroom/Position.java | 8 - .../DataValueNotAvailableException.java | 10 - .../LibrariesNotFoundException.java | 5 - .../dionysus/exceptions/LoaderException.java | 6 - .../MalformedBlockConditionException.java | 10 - .../NoVersionInformationException.java | 7 - .../UnexpectedDataTypeException.java | 20 - .../exceptions/WhatTheFuckException.java | 10 - .../exceptions/WrongVersionException.java | 13 - .../persei/dionysus/files/FileManager.java | 38 - .../files/NoSetupObjectException.java | 8 - .../dionysus/files/SetupFileHelper.java | 20 - .../net/persei/dionysus/managers/Command.java | 6 + .../dionysus/managers/CommandManager.java | 54 ++ .../net/persei/dionysus/managers/Event.java | 55 ++ .../persei/dionysus/managers/MidiManager.java | 104 +++ .../persei/dionysus/managers/MidiSource.java | 5 + .../dionysus/managers/PlayerManager.java | 49 ++ .../persei/dionysus/managers/Sequence.java | 10 + .../persei/dionysus/players/PlayerType.java | 5 + .../persei/dionysus/players/VideoPlayer.java | 13 +- src/main/resources/keep | 0 src/test/java/keep | 0 src/test/resources/keep | 0 .../net/persei/dionysus/AudioPlayer.class | Bin 1477 -> 0 bytes target/classes/net/persei/dionysus/Main.class | Bin 1098 -> 0 bytes .../net/persei/dionysus/MidiTrigger.class | Bin 298 -> 0 bytes .../classes/net/persei/dionysus/Player.class | Bin 351 -> 0 bytes .../net/persei/dionysus/PlayerGUI$1.class | Bin 1052 -> 0 bytes .../net/persei/dionysus/PlayerGUI.class | Bin 2491 -> 0 bytes .../classes/net/persei/dionysus/Setup$1.class | Bin 603 -> 0 bytes .../classes/net/persei/dionysus/Setup.class | Bin 1506 -> 0 bytes .../net/persei/dionysus/blocks/Block.class | Bin 1448 -> 0 bytes .../dionysus/blocks/BlockCondition.class | Bin 3877 -> 0 bytes .../persei/dionysus/blocks/BlockHelper.class | Bin 1124 -> 0 bytes .../persei/dionysus/blocks/BlockType.class | Bin 1201 -> 0 bytes .../dionysus/blocks/ConditionalBlock.class | Bin 343 -> 0 bytes .../net/persei/dionysus/blocks/Data.class | Bin 948 -> 0 bytes .../persei/dionysus/blocks/DelayBlock.class | Bin 1430 -> 0 bytes .../persei/dionysus/blocks/IfElseBlock.class | Bin 1446 -> 0 bytes .../persei/dionysus/blocks/InitialBlock.class | Bin 1255 -> 0 bytes .../net/persei/dionysus/blocks/Lane.class | Bin 1919 -> 0 bytes .../persei/dionysus/blocks/SetDataBlock.class | Bin 1782 -> 0 bytes .../dionysus/blocks/SetStateBlock.class | Bin 1603 -> 0 bytes .../dionysus/blocks/SetupParser$Mode.class | Bin 1284 -> 0 bytes .../persei/dionysus/blocks/SetupParser.class | Bin 1942 -> 0 bytes .../dionysus/blocks/SplitterBlock.class | Bin 1550 -> 0 bytes .../ControlRoom$ControlRoomPanel.class | Bin 1554 -> 0 bytes .../dionysus/controlroom/ControlRoom.class | Bin 1193 -> 0 bytes .../DataValueNotAvailableException.class | Bin 444 -> 0 bytes .../LibrariesNotFoundException.class | Bin 432 -> 0 bytes .../MalformedBlockConditionException.class | Bin 450 -> 0 bytes .../MalformedSetupFileException.class | Bin 435 -> 0 bytes .../UnexpectedDataTypeException.class | Bin 646 -> 0 bytes .../exceptions/WhatTheFuckException.class | Bin 414 -> 0 bytes 82 files changed, 358 insertions(+), 1601 deletions(-) delete mode 100644 LICENSE delete mode 100644 pom.xml delete mode 100644 src/main/java/net/persei/dionysus/AudioPlayer.java delete mode 100644 src/main/java/net/persei/dionysus/Data.java delete mode 100644 src/main/java/net/persei/dionysus/MidiTrigger.java delete mode 100644 src/main/java/net/persei/dionysus/Player.java delete mode 100644 src/main/java/net/persei/dionysus/PlayerGUI.java delete mode 100644 src/main/java/net/persei/dionysus/Setup.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/Block.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/BlockCondition.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/BlockHelper.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/BlockType.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/ConditionalBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/DelayBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/IfElseBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/InitialBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/Lane.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/MultiThreadBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/SetDataBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/SetStateBlock.java delete mode 100644 src/main/java/net/persei/dionysus/blocks/SplitterBlock.java delete mode 100644 src/main/java/net/persei/dionysus/controlroom/Clickable.java delete mode 100644 src/main/java/net/persei/dionysus/controlroom/ControlPanelBlock.java delete mode 100644 src/main/java/net/persei/dionysus/controlroom/ControlPanelComponent.java delete mode 100644 src/main/java/net/persei/dionysus/controlroom/ControlRoom.java delete mode 100644 src/main/java/net/persei/dionysus/controlroom/Drawable.java delete mode 100644 src/main/java/net/persei/dionysus/controlroom/Position.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/DataValueNotAvailableException.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/LoaderException.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/MalformedBlockConditionException.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/NoVersionInformationException.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/UnexpectedDataTypeException.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/WhatTheFuckException.java delete mode 100644 src/main/java/net/persei/dionysus/exceptions/WrongVersionException.java delete mode 100644 src/main/java/net/persei/dionysus/files/FileManager.java delete mode 100644 src/main/java/net/persei/dionysus/files/NoSetupObjectException.java delete mode 100644 src/main/java/net/persei/dionysus/files/SetupFileHelper.java create mode 100644 src/main/java/net/persei/dionysus/managers/Command.java create mode 100644 src/main/java/net/persei/dionysus/managers/CommandManager.java create mode 100644 src/main/java/net/persei/dionysus/managers/Event.java create mode 100644 src/main/java/net/persei/dionysus/managers/MidiManager.java create mode 100644 src/main/java/net/persei/dionysus/managers/MidiSource.java create mode 100644 src/main/java/net/persei/dionysus/managers/PlayerManager.java create mode 100644 src/main/java/net/persei/dionysus/managers/Sequence.java create mode 100644 src/main/java/net/persei/dionysus/players/PlayerType.java delete mode 100644 src/main/resources/keep delete mode 100644 src/test/java/keep delete mode 100644 src/test/resources/keep delete mode 100644 target/classes/net/persei/dionysus/AudioPlayer.class delete mode 100644 target/classes/net/persei/dionysus/Main.class delete mode 100644 target/classes/net/persei/dionysus/MidiTrigger.class delete mode 100644 target/classes/net/persei/dionysus/Player.class delete mode 100644 target/classes/net/persei/dionysus/PlayerGUI$1.class delete mode 100644 target/classes/net/persei/dionysus/PlayerGUI.class delete mode 100644 target/classes/net/persei/dionysus/Setup$1.class delete mode 100644 target/classes/net/persei/dionysus/Setup.class delete mode 100644 target/classes/net/persei/dionysus/blocks/Block.class delete mode 100644 target/classes/net/persei/dionysus/blocks/BlockCondition.class delete mode 100644 target/classes/net/persei/dionysus/blocks/BlockHelper.class delete mode 100644 target/classes/net/persei/dionysus/blocks/BlockType.class delete mode 100644 target/classes/net/persei/dionysus/blocks/ConditionalBlock.class delete mode 100644 target/classes/net/persei/dionysus/blocks/Data.class delete mode 100644 target/classes/net/persei/dionysus/blocks/DelayBlock.class delete mode 100644 target/classes/net/persei/dionysus/blocks/IfElseBlock.class delete mode 100644 target/classes/net/persei/dionysus/blocks/InitialBlock.class delete mode 100644 target/classes/net/persei/dionysus/blocks/Lane.class delete mode 100644 target/classes/net/persei/dionysus/blocks/SetDataBlock.class delete mode 100644 target/classes/net/persei/dionysus/blocks/SetStateBlock.class delete mode 100644 target/classes/net/persei/dionysus/blocks/SetupParser$Mode.class delete mode 100644 target/classes/net/persei/dionysus/blocks/SetupParser.class delete mode 100644 target/classes/net/persei/dionysus/blocks/SplitterBlock.class delete mode 100644 target/classes/net/persei/dionysus/controlroom/ControlRoom$ControlRoomPanel.class delete mode 100644 target/classes/net/persei/dionysus/controlroom/ControlRoom.class delete mode 100644 target/classes/net/persei/dionysus/exceptions/DataValueNotAvailableException.class delete mode 100644 target/classes/net/persei/dionysus/exceptions/LibrariesNotFoundException.class delete mode 100644 target/classes/net/persei/dionysus/exceptions/MalformedBlockConditionException.class delete mode 100644 target/classes/net/persei/dionysus/exceptions/MalformedSetupFileException.class delete mode 100644 target/classes/net/persei/dionysus/exceptions/UnexpectedDataTypeException.class delete mode 100644 target/classes/net/persei/dionysus/exceptions/WhatTheFuckException.class diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9cecc1d..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} - - 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: - - {project} Copyright (C) {year} {fullname} - 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 -. diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 6a825c7..0000000 --- a/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - net.persei.dionysus - Dionysus - 0.0.1-SNAPSHOT - - - uk.co.caprica - vlcj - 3.8.0 - - - \ No newline at end of file diff --git a/src/main/java/net/persei/dionysus/AudioPlayer.java b/src/main/java/net/persei/dionysus/AudioPlayer.java deleted file mode 100644 index a389ba2..0000000 --- a/src/main/java/net/persei/dionysus/AudioPlayer.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.persei.dionysus; - -import uk.co.caprica.vlcj.component.AudioMediaPlayerComponent; -import uk.co.caprica.vlcj.player.MediaPlayer; - -public class AudioPlayer implements Player { - - private AudioMediaPlayerComponent player; - private boolean loop = false; - private String name; - - public AudioPlayer(String name) { - this.name = name; - player = new AudioMediaPlayerComponent(); - } - - public boolean isLoop() { - return loop; - } - - public void playFile(String file) { - getMediaPlayer().playMedia(file); - } - - public void play() { - getMediaPlayer().play(); - } - - public void pause() { - getMediaPlayer().pause(); - } - - public void setLoop(boolean loop) { - this.loop = loop; - getMediaPlayer().setRepeat(loop); - } - - public MediaPlayer getMediaPlayer() { - return player.getMediaPlayer(); - } - - public String getName() { - return name; - } -} diff --git a/src/main/java/net/persei/dionysus/Data.java b/src/main/java/net/persei/dionysus/Data.java deleted file mode 100644 index 49a1ffa..0000000 --- a/src/main/java/net/persei/dionysus/Data.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.persei.dionysus; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -public class Data implements Serializable { - private static final long serialVersionUID = 825230953015875521L; - private Map map = new HashMap(); - - public Data(Data input) { - super(); - this.map = new HashMap(input.map); - } - public Data() { - super(); - } - public Object getEntry(String key) { - return map.get(key); - } - public Object setEntry(String key, Object obj) { - return map.put(key, obj); - } -} diff --git a/src/main/java/net/persei/dionysus/Main.java b/src/main/java/net/persei/dionysus/Main.java index 8f36dad..e783c77 100644 --- a/src/main/java/net/persei/dionysus/Main.java +++ b/src/main/java/net/persei/dionysus/Main.java @@ -1,39 +1,75 @@ package net.persei.dionysus; -import java.io.IOException; +import javax.sound.midi.MidiUnavailableException; import net.persei.dionysus.exceptions.LibrariesNotFoundException; -import net.persei.dionysus.exceptions.LoaderException; -import net.persei.dionysus.files.FileManager; +import net.persei.dionysus.managers.Command; +import net.persei.dionysus.managers.CommandManager; +import net.persei.dionysus.managers.Event; +import net.persei.dionysus.managers.MidiManager; +import net.persei.dionysus.managers.MidiSource; +import net.persei.dionysus.managers.PlayerManager; +import net.persei.dionysus.managers.Sequence; +import net.persei.dionysus.players.PlayerType; import uk.co.caprica.vlcj.binding.LibVlc; import uk.co.caprica.vlcj.discovery.NativeDiscovery; public class Main { public static final String TITLE = "Dionysus"; - - /** - * @throws ClassNotFoundException - * @param args - * @throws LibrariesNotFoundException - * @throws IOException - * @throws LoaderException - * @throws - */ - public static void main(String[] args) throws LibrariesNotFoundException, IOException, LoaderException, ClassNotFoundException { + + public static void main(String[] args) + throws LibrariesNotFoundException, MidiUnavailableException, InterruptedException { if (!findLibs()) throw new LibrariesNotFoundException(); - System.out.println(LibVlc.INSTANCE.libvlc_get_version()); - - Setup setup = new Setup(); - setup.getData().setEntry("test", "bla"); - - FileManager manager = new FileManager(); - manager.saveSetup("test.dio", setup); - setup = null; - setup = manager.loadSetup("test.dio"); - - System.out.println(setup.getData().getEntry("test")); + System.out.println(LibVlc.INSTANCE.libvlc_get_version()); + + System.out.println("Adding players..."); + PlayerManager.getInstance().create(PlayerType.Video, "TestVideo", true); + PlayerManager.getInstance().create(PlayerType.Audio, "TestAudio", true); + + System.out.println("Instancing command manager..."); + CommandManager commandManager = new CommandManager(); + System.out.println("Instancing midi manager..."); + MidiManager midiManager = new MidiManager(commandManager); + + System.out.println("Adding commands..."); + commandManager.addCommand(new Sequence().append(new Event(MidiSource.LAUNCHPAD, true, 0, 0, 0, 0)), + new Command() { + @Override + public String getName() { + return "Test Command"; + } + + @Override + public void execute() { + PlayerManager.getInstance().getByName("TestVideo").playFile("test.mp4"); + System.out.println("Hallo Welt"); + } + }); + commandManager.addCommand(new Sequence().append(new Event(MidiSource.LAUNCHPAD, true, 0, 1, 0, 0)) + .append(new Event(MidiSource.LAUNCHPAD, true, 0, 2, 0, 0)), new Command() { + @Override + public String getName() { + return "Test Sequence Command"; + } + + @Override + public void execute() { + PlayerManager.getInstance().getByName("TestAudio").playFile("test.mp3"); + System.out.println("Sequence Test"); + } + }); + + System.out.println("Adding shutdown hook..."); + Runtime.getRuntime().addShutdownHook(new Thread() { + public void run() { + midiManager.close(); + } + }); + + while (true) + Thread.sleep(Long.MAX_VALUE); } private static boolean findLibs() { diff --git a/src/main/java/net/persei/dionysus/MidiTrigger.java b/src/main/java/net/persei/dionysus/MidiTrigger.java deleted file mode 100644 index 40f68da..0000000 --- a/src/main/java/net/persei/dionysus/MidiTrigger.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.persei.dionysus; - -public class MidiTrigger { - -} diff --git a/src/main/java/net/persei/dionysus/Player.java b/src/main/java/net/persei/dionysus/Player.java deleted file mode 100644 index 7100668..0000000 --- a/src/main/java/net/persei/dionysus/Player.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.persei.dionysus; - -import uk.co.caprica.vlcj.player.MediaPlayer; - -public interface Player { - boolean isLoop(); - void playFile(String file); - void play(); - void pause(); - void setLoop(boolean loop); - MediaPlayer getMediaPlayer(); - String getName(); -} diff --git a/src/main/java/net/persei/dionysus/PlayerGUI.java b/src/main/java/net/persei/dionysus/PlayerGUI.java deleted file mode 100644 index f7dee8f..0000000 --- a/src/main/java/net/persei/dionysus/PlayerGUI.java +++ /dev/null @@ -1,79 +0,0 @@ -package net.persei.dionysus; - -import java.awt.HeadlessException; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - -import javax.swing.JFrame; - -import uk.co.caprica.vlcj.component.EmbeddedMediaPlayerComponent; -import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer; - -public class PlayerGUI extends JFrame implements Player { - - /** - * - */ - private static final long serialVersionUID = 6068058949441154348L; - - private EmbeddedMediaPlayerComponent player = new EmbeddedMediaPlayerComponent(); - - private boolean loop = false; - private boolean fullscreen = false; - - public boolean isFullscreen() { - return fullscreen; - } - - public PlayerGUI(boolean fullscreen) throws HeadlessException { - this(); - dispose(); - if (fullscreen) { - setExtendedState(JFrame.MAXIMIZED_BOTH); - setUndecorated(true); - } - setVisible(true); - } - public PlayerGUI() throws HeadlessException { - super(Main.TITLE); - setBounds(100, 100, 600, 400); - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - setVisible(true); - - setContentPane(player); - - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent e) { - player.release(); - System.out.println("release"); - System.exit(0); - } - }); - } - - public boolean isLoop() { - return loop; - } - - public void setLoop(boolean loop) { - this.loop = loop; - getMediaPlayer().setRepeat(loop); - } - - public void playFile(String file) { - getMediaPlayer().playMedia(file); - } - - public void play() { - getMediaPlayer().play(); - } - - public void pause() { - getMediaPlayer().pause(); - } - - public EmbeddedMediaPlayer getMediaPlayer() { - return player.getMediaPlayer(); - } -} diff --git a/src/main/java/net/persei/dionysus/Setup.java b/src/main/java/net/persei/dionysus/Setup.java deleted file mode 100644 index 75d0113..0000000 --- a/src/main/java/net/persei/dionysus/Setup.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.persei.dionysus; - -import java.io.Serializable; -import java.util.LinkedList; -import java.util.List; - -import net.persei.dionysus.blocks.InitialBlock; -import net.persei.dionysus.players.Player; - -public class Setup implements Serializable { - private static final long serialVersionUID = -5974881686360496618L; - private List initBlocks = new LinkedList(); - private List players = new LinkedList(); - private Data data = new Data(); - - // ugly, but necessary for flexible states - private List states = new LinkedList(){ - private static final long serialVersionUID = 1L; - { - push("none"); - } - }; - private int state = 0; - - public List getInitBlocks() { - return initBlocks; - } - - public List getPlayers() { - return players; - } - - public String getState() { - return states.get(state); - } - - public void setState(int state) { - this.state = state; - } - - public List getStates() { - return states; - } - public Data getData() { - return data; - } -} diff --git a/src/main/java/net/persei/dionysus/blocks/Block.java b/src/main/java/net/persei/dionysus/blocks/Block.java deleted file mode 100644 index c9f2213..0000000 --- a/src/main/java/net/persei/dionysus/blocks/Block.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.persei.dionysus.blocks; - -import java.io.Serializable; -import java.util.LinkedList; -import java.util.List; - -import net.persei.dionysus.Data; - -public abstract class Block implements Serializable { - private static final long serialVersionUID = 2452582891824176260L; - protected String name; - protected BlockType type; - protected List lanes = new LinkedList(); - - public List getOutputLanes() { - return lanes; - } - public String getName() { - return name; - } - public BlockType getType() { - return type; - } - - public boolean preMagic (Data input, Lane lane) throws Exception { - BlockHelper.addPassLog(input, "blocks", this); - return magic(input, lane); - } - - abstract public boolean magic(Data input, Lane lane) throws Exception; -} diff --git a/src/main/java/net/persei/dionysus/blocks/BlockCondition.java b/src/main/java/net/persei/dionysus/blocks/BlockCondition.java deleted file mode 100644 index 397fd95..0000000 --- a/src/main/java/net/persei/dionysus/blocks/BlockCondition.java +++ /dev/null @@ -1,112 +0,0 @@ -package net.persei.dionysus.blocks; - -import java.util.Map; - -import net.persei.dionysus.Data; -import net.persei.dionysus.Setup; -import net.persei.dionysus.exceptions.DataValueNotAvailableException; -import net.persei.dionysus.exceptions.MalformedBlockConditionException; - -public class BlockCondition { - - private String condition; - - public BlockCondition(String condition) { - condition = condition.replace(" ", ""); - condition = condition.replace(" ", ""); - condition = condition.replace("\n", ""); - condition = condition.replace("\r", ""); - - this.condition = condition; - } - - public boolean parse(Data input) throws MalformedBlockConditionException, DataValueNotAvailableException { - String tmp = new String(condition); - - while(true) { - if (tmp.indexOf("(") < 0) - break; - - int open = 0; - while(tmp.indexOf("(", open + 1) >= 0) { - open = tmp.indexOf("(", open + 1); - } - int close = tmp.indexOf(")", open); - - if (close == -1) - throw new MalformedBlockConditionException(); - - String sub = tmp.substring(open + 1, close - 1); - String before = tmp.substring(0, open - 1); - String after = tmp.substring(close + 1); - tmp = before + (minTerm(sub, input)) + after; - } - - return minTerm(tmp, input); - } - private boolean minTerm(String sub, Data input) throws DataValueNotAvailableException, MalformedBlockConditionException { - if (sub.equals("true")) - return true; - if (sub.equals("false")) - return false; - if (sub.indexOf("&") >= 0) - return minTerm(sub.substring(0, sub.indexOf("&")), input) && - minTerm(sub.substring(sub.indexOf("&") + 1), input); - if (sub.indexOf("|") >= 0) - return minTerm(sub.substring(0, sub.indexOf("|")), input) || - minTerm(sub.substring(sub.indexOf("|") + 1), input); - if (sub.indexOf("^") >= 0) - return minTerm(sub.substring(0, sub.indexOf("^")), input) ^ - minTerm(sub.substring(sub.indexOf("^") + 1), input); - if (sub.indexOf("!") >= 0) - return ! minTerm(sub.substring(sub.indexOf("!") + 1), input); - if (sub.indexOf("==") >= 0) - return stringValue(sub.substring(0, sub.indexOf("==")), input).equals(stringValue(sub.substring(sub.indexOf("==") + 1), input)); - if (sub.indexOf(">") >= 0) - return intValue(sub.substring(0, sub.indexOf(">")), input) > intValue(sub.substring(sub.indexOf(">") + 1), input); - if (sub.indexOf("<") >= 0) - return intValue(sub.substring(0, sub.indexOf("<")), input) < intValue(sub.substring(sub.indexOf("<") + 1), input); - if (sub.indexOf(">=") >= 0) - return intValue(sub.substring(0, sub.indexOf(">=")), input) >= intValue(sub.substring(sub.indexOf(">=") + 1), input); - if (sub.indexOf("<=") >= 0) - return intValue(sub.substring(0, sub.indexOf("<=")), input) >= intValue(sub.substring(sub.indexOf("<=") + 1), input); - if (sub.indexOf("data") >= 0) - return minTerm(getDataValue(sub, input), input); - - throw new MalformedBlockConditionException(); - } - - private int intValue(String substring, Data input) { - try { - return Integer.parseInt(substring); - } catch (NumberFormatException e) { - } - try { - return Integer.parseInt(getDataValue(substring, input)); - } catch (NumberFormatException e) { - } catch (Exception e) { - } - throw new NumberFormatException(); - } - - private String getDataValue(String string, Data input) throws DataValueNotAvailableException { - if (string.equals("setup.state")) - return ((Setup) input.getEntry("setup")).getState(); - if (string.indexOf("data.") == 0) { - String key = string.substring("data.".length() + 1); - if (input.getEntry("blockData") != null) { - Map blockData = (Map) input.getEntry("blockData"); - if (blockData.get(key) != null) - return blockData.get(key); - } - } - throw new DataValueNotAvailableException(); - } - - private String stringValue(String string, Data input) throws DataValueNotAvailableException { - if (string.substring(0, 1).equals("\"") && string.substring(string.length() - 1).equals("\"")) - return string.substring(1, string.length() - 1); - - return getDataValue(string, input); - } -} diff --git a/src/main/java/net/persei/dionysus/blocks/BlockHelper.java b/src/main/java/net/persei/dionysus/blocks/BlockHelper.java deleted file mode 100644 index 3d6376c..0000000 --- a/src/main/java/net/persei/dionysus/blocks/BlockHelper.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.persei.dionysus.blocks; - -import java.util.LinkedList; -import java.util.List; - -import net.persei.dionysus.Data; -import net.persei.dionysus.exceptions.UnexpectedDataTypeException; - -public class BlockHelper { - static void addPassLog(Data input, String type, Object object) throws UnexpectedDataTypeException { - Object obj = input.getEntry(type); - List log; - if (obj == null) { - log = new LinkedList(); - } else if (! (obj instanceof List)) { - throw new UnexpectedDataTypeException(type); - } else { - log = (List) obj; - } - log.add(object); - } -} diff --git a/src/main/java/net/persei/dionysus/blocks/BlockType.java b/src/main/java/net/persei/dionysus/blocks/BlockType.java deleted file mode 100644 index f8033f7..0000000 --- a/src/main/java/net/persei/dionysus/blocks/BlockType.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.persei.dionysus.blocks; - -public enum BlockType { - PassiveBlock, - ActiveBlock, - ConditionalBlock, - MultiplexingBlock -} diff --git a/src/main/java/net/persei/dionysus/blocks/ConditionalBlock.java b/src/main/java/net/persei/dionysus/blocks/ConditionalBlock.java deleted file mode 100644 index 1af5a06..0000000 --- a/src/main/java/net/persei/dionysus/blocks/ConditionalBlock.java +++ /dev/null @@ -1,5 +0,0 @@ -package net.persei.dionysus.blocks; - -public abstract class ConditionalBlock extends Block { - private static final long serialVersionUID = 8895574016577951453L; -} diff --git a/src/main/java/net/persei/dionysus/blocks/DelayBlock.java b/src/main/java/net/persei/dionysus/blocks/DelayBlock.java deleted file mode 100644 index c3e1eae..0000000 --- a/src/main/java/net/persei/dionysus/blocks/DelayBlock.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.persei.dionysus.blocks; - -import net.persei.dionysus.Data; - -public class DelayBlock extends Block { - private static final long serialVersionUID = -3892822705334086078L; - private long sleepTime = 1000; - - public long getSleepTime() { - return sleepTime; - } - - public void setSleepTime(long sleepTime) { - this.sleepTime = sleepTime; - } - - public DelayBlock() { - super(); - name = "DelayBlock"; - type = BlockType.PassiveBlock; - lanes.add(new Lane("delayed lane")); - } - - public boolean magic(Data input, Lane lane) throws Exception { - Thread.sleep(sleepTime); - - return lanes.get(0).invoke(input); - } - -} diff --git a/src/main/java/net/persei/dionysus/blocks/IfElseBlock.java b/src/main/java/net/persei/dionysus/blocks/IfElseBlock.java deleted file mode 100644 index f885838..0000000 --- a/src/main/java/net/persei/dionysus/blocks/IfElseBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.persei.dionysus.blocks; - -import net.persei.dionysus.Data; - -public class IfElseBlock extends ConditionalBlock { - private static final long serialVersionUID = 851005550879292074L; - private BlockCondition condition; - - public IfElseBlock(BlockCondition condition) { - super(); - this.name = "IfElseBlock"; - this.type = BlockType.ConditionalBlock; - - this.condition = condition; - this.lanes.add(new Lane("false lane")); // 0 - this.lanes.add(new Lane("true lane")); // 1 - } - - @Override - public boolean magic(Data input, Lane lane) throws Exception { - if (condition.parse(input)) - return lanes.get(1).invoke(input); - else - return lanes.get(0).invoke(input); - } -} diff --git a/src/main/java/net/persei/dionysus/blocks/InitialBlock.java b/src/main/java/net/persei/dionysus/blocks/InitialBlock.java deleted file mode 100644 index 7fb7701..0000000 --- a/src/main/java/net/persei/dionysus/blocks/InitialBlock.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.persei.dionysus.blocks; - -import java.util.LinkedList; -import java.util.List; - -import net.persei.dionysus.Data; -import net.persei.dionysus.MidiTrigger; -import net.persei.dionysus.Setup; -import net.persei.dionysus.exceptions.UnexpectedDataTypeException; - -public abstract class InitialBlock extends Block { - private static final long serialVersionUID = 7065582566195305774L; - protected List triggers = new LinkedList(); - - public List getTriggers() { - return triggers; - } - - public boolean trigger(MidiTrigger trigger, Setup setup) throws Exception { - Data input = new Data(); - input.setEntry("trigger", trigger); - input.setEntry("setup", setup); - return preMagic(input, null); - } -} diff --git a/src/main/java/net/persei/dionysus/blocks/Lane.java b/src/main/java/net/persei/dionysus/blocks/Lane.java deleted file mode 100644 index 5113889..0000000 --- a/src/main/java/net/persei/dionysus/blocks/Lane.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.persei.dionysus.blocks; - -import java.io.Serializable; -import java.util.LinkedList; -import java.util.List; - -import net.persei.dionysus.Data; - -public class Lane implements Serializable { - private static final long serialVersionUID = -317193861413134584L; - private List attachedBlocks = new LinkedList(); - static private int count = 1; - final private int id; - final private String name; - - public List getAttachedBlocks() { - return attachedBlocks; - } - - public String getName() { - return name; - } - - public Lane(String name) { - super(); - this.id = count++; - this.name = name; - } - - public void attach(Block block) { - attachedBlocks.add(block); - } - - public boolean invoke(Data input) throws Exception { - BlockHelper.addPassLog(input, "lanes", this); - - boolean res = true; - for (Block block : attachedBlocks) { - res = block.preMagic(input, this) & res; - } - return res; - } -} diff --git a/src/main/java/net/persei/dionysus/blocks/MultiThreadBlock.java b/src/main/java/net/persei/dionysus/blocks/MultiThreadBlock.java deleted file mode 100644 index c5d5416..0000000 --- a/src/main/java/net/persei/dionysus/blocks/MultiThreadBlock.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.persei.dionysus.blocks; - -import net.persei.dionysus.Data; - -public class MultiThreadBlock extends Block { - private static final long serialVersionUID = -7687603755832903813L; - - public MultiThreadBlock(int n) { - super(); - for (int i = 0; i < n; i++) { - this.lanes.add(new Lane("thread lane " + i)); - } - this.name = "MultiThreadBlock"; - this.type = BlockType.MultiplexingBlock; - } - - private class LaneThread extends Thread { - private Lane lane; - private Data input; - private Block parent; - - public LaneThread (Data input, Lane lane, Block parent) { - this.input = input; - this.lane = lane; - this.parent = parent; - } - - public void run() { - try { - lane.invoke(input); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @Override - public boolean magic(Data input, Lane lane) throws Exception { - for (Lane l : lanes) { - new LaneThread(input, l, this).start(); - } - return true; - } - -} diff --git a/src/main/java/net/persei/dionysus/blocks/SetDataBlock.java b/src/main/java/net/persei/dionysus/blocks/SetDataBlock.java deleted file mode 100644 index f86d3cf..0000000 --- a/src/main/java/net/persei/dionysus/blocks/SetDataBlock.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.persei.dionysus.blocks; - -import java.util.HashMap; -import java.util.Map; - -import net.persei.dionysus.Data; - -public class SetDataBlock extends Block { - private static final long serialVersionUID = 1007781353625719636L; - private String data; - private String key; - - public SetDataBlock(String key, String data) { - super(); - name = "SetDateBlock"; - type = BlockType.ActiveBlock; - this.key = key; - this.data = data; - lanes.add(new Lane("lane")); - } - - @Override - public boolean magic(Data input, Lane lane) throws Exception { - Map blockData = (Map) input.getEntry("blockData"); - if (blockData == null) { - input.setEntry("blockData", new HashMap()); - blockData = (Map) input.getEntry("blockData"); - } - blockData.put(key, data); - - return this.lanes.get(0).invoke(input); - } - -} diff --git a/src/main/java/net/persei/dionysus/blocks/SetStateBlock.java b/src/main/java/net/persei/dionysus/blocks/SetStateBlock.java deleted file mode 100644 index 5970a81..0000000 --- a/src/main/java/net/persei/dionysus/blocks/SetStateBlock.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.persei.dionysus.blocks; - -import net.persei.dionysus.Data; -import net.persei.dionysus.Setup; - -public class SetStateBlock extends Block { - private static final long serialVersionUID = -6111464916913814484L; - private String state; - - public SetStateBlock(String status) { - super(); - name = "SetStateBlock"; - type = BlockType.ActiveBlock; - this.state = status; - lanes.add(new Lane("lane")); - } - - @Override - public boolean magic(Data input, Lane lane) throws Exception { - Setup setup = ((Setup) input.getEntry("setup")); - int i = setup.getStates().indexOf(state); - if (i >= 0) - setup.setState(i); - else { - setup.getStates().add(state); - setup.setState(setup.getStates().indexOf(state)); - } - return this.lanes.get(0).invoke(input); - } - -} diff --git a/src/main/java/net/persei/dionysus/blocks/SplitterBlock.java b/src/main/java/net/persei/dionysus/blocks/SplitterBlock.java deleted file mode 100644 index 48ccc98..0000000 --- a/src/main/java/net/persei/dionysus/blocks/SplitterBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.persei.dionysus.blocks; - -import net.persei.dionysus.Data; - -public class SplitterBlock extends Block { - private static final long serialVersionUID = -5591009739089256605L; - - public SplitterBlock(int n) { - super(); - for (int i = 0; i < n; i++) { - this.lanes.add(new Lane("split lane " + i)); - } - this.name = "SplitterBlock"; - this.type = BlockType.MultiplexingBlock; - } - - @Override - public boolean magic(Data input, Lane lane) throws Exception { - boolean res = true; - for (Lane l : lanes) { - res = l.invoke(new Data(input)) && res; - } - return res; - } - -} diff --git a/src/main/java/net/persei/dionysus/controlroom/Clickable.java b/src/main/java/net/persei/dionysus/controlroom/Clickable.java deleted file mode 100644 index 867b8a9..0000000 --- a/src/main/java/net/persei/dionysus/controlroom/Clickable.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.persei.dionysus.controlroom; - -import java.awt.Event; - -public interface Clickable { - void click(Position relativePosition); -} diff --git a/src/main/java/net/persei/dionysus/controlroom/ControlPanelBlock.java b/src/main/java/net/persei/dionysus/controlroom/ControlPanelBlock.java deleted file mode 100644 index fe1ef71..0000000 --- a/src/main/java/net/persei/dionysus/controlroom/ControlPanelBlock.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.persei.dionysus.controlroom; - -import java.awt.Graphics; - -public interface ControlPanelBlock extends ControlPanelComponent, Clickable { - default void draw(Graphics graphics) { - - } -} diff --git a/src/main/java/net/persei/dionysus/controlroom/ControlPanelComponent.java b/src/main/java/net/persei/dionysus/controlroom/ControlPanelComponent.java deleted file mode 100644 index 71561e8..0000000 --- a/src/main/java/net/persei/dionysus/controlroom/ControlPanelComponent.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.persei.dionysus.controlroom; - -import java.awt.Dimension; - -public interface ControlPanelComponent extends Drawable { - public Dimension getDimension(); - public void setPosition(Position position); - public Position getPosition(); -} diff --git a/src/main/java/net/persei/dionysus/controlroom/ControlRoom.java b/src/main/java/net/persei/dionysus/controlroom/ControlRoom.java deleted file mode 100644 index 678a1b2..0000000 --- a/src/main/java/net/persei/dionysus/controlroom/ControlRoom.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.persei.dionysus.controlroom; - -import java.awt.Color; -import java.awt.Graphics; -import java.util.List; - -import javax.swing.JFrame; -import javax.swing.JPanel; - -import net.persei.dionysus.Setup; -import net.persei.dionysus.blocks.InitialBlock; - -public class ControlRoom extends JFrame { - - private ControlRoomPanel panel; - private Setup setup; - - /** - * - */ - private static final long serialVersionUID = 7130672040530068619L; - - public ControlRoom(Setup setup) { - super(); - this.setup = setup; - setBounds(50, 50, 1000, 800); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setVisible(true); - - panel = new ControlRoomPanel(); - - setContentPane(panel); - } - - private class ControlRoomPanel extends JPanel { - - /** - * - */ - private static final long serialVersionUID = 7915937062340285742L; - - @Override - protected void paintComponent(Graphics g) { - super.paintComponents(g); - g.setColor(Color.BLACK); - List initBlocks = setup.getInitBlocks(); - } - } -} diff --git a/src/main/java/net/persei/dionysus/controlroom/Drawable.java b/src/main/java/net/persei/dionysus/controlroom/Drawable.java deleted file mode 100644 index fd2a47f..0000000 --- a/src/main/java/net/persei/dionysus/controlroom/Drawable.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.persei.dionysus.controlroom; - -import java.awt.Graphics; - -public interface Drawable { - void draw(Graphics graphics); -} diff --git a/src/main/java/net/persei/dionysus/controlroom/Position.java b/src/main/java/net/persei/dionysus/controlroom/Position.java deleted file mode 100644 index 1fcd508..0000000 --- a/src/main/java/net/persei/dionysus/controlroom/Position.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.persei.dionysus.controlroom; - -import java.awt.Point; - -public class Position extends Point { - private static final long serialVersionUID = -3324245757186935151L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/DataValueNotAvailableException.java b/src/main/java/net/persei/dionysus/exceptions/DataValueNotAvailableException.java deleted file mode 100644 index 45f098a..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/DataValueNotAvailableException.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.persei.dionysus.exceptions; - -public class DataValueNotAvailableException extends Exception { - - /** - * - */ - private static final long serialVersionUID = 3826451107086625794L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/LibrariesNotFoundException.java b/src/main/java/net/persei/dionysus/exceptions/LibrariesNotFoundException.java index b2c59bb..d4abb82 100644 --- a/src/main/java/net/persei/dionysus/exceptions/LibrariesNotFoundException.java +++ b/src/main/java/net/persei/dionysus/exceptions/LibrariesNotFoundException.java @@ -2,9 +2,4 @@ package net.persei.dionysus.exceptions; public class LibrariesNotFoundException extends Exception { - /** - * - */ - private static final long serialVersionUID = -1839814203088638288L; - } diff --git a/src/main/java/net/persei/dionysus/exceptions/LoaderException.java b/src/main/java/net/persei/dionysus/exceptions/LoaderException.java deleted file mode 100644 index 0b88caf..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/LoaderException.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.persei.dionysus.exceptions; - -public class LoaderException extends Exception { - private static final long serialVersionUID = -1701002807913867876L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/MalformedBlockConditionException.java b/src/main/java/net/persei/dionysus/exceptions/MalformedBlockConditionException.java deleted file mode 100644 index bb09435..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/MalformedBlockConditionException.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.persei.dionysus.exceptions; - -public class MalformedBlockConditionException extends Exception { - - /** - * - */ - private static final long serialVersionUID = -8751303849610920723L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/NoVersionInformationException.java b/src/main/java/net/persei/dionysus/exceptions/NoVersionInformationException.java deleted file mode 100644 index 9ecf98e..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/NoVersionInformationException.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.persei.dionysus.exceptions; - - -public class NoVersionInformationException extends LoaderException { - private static final long serialVersionUID = -4262574113425711478L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/UnexpectedDataTypeException.java b/src/main/java/net/persei/dionysus/exceptions/UnexpectedDataTypeException.java deleted file mode 100644 index 6265caf..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/UnexpectedDataTypeException.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.persei.dionysus.exceptions; - -public class UnexpectedDataTypeException extends Exception { - - private String dataKey = null; - - public String getDataKey() { - return dataKey; - } - - public UnexpectedDataTypeException(String string) { - dataKey = string; - } - - /** - * - */ - private static final long serialVersionUID = 3634084166179938086L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/WhatTheFuckException.java b/src/main/java/net/persei/dionysus/exceptions/WhatTheFuckException.java deleted file mode 100644 index fa63285..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/WhatTheFuckException.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.persei.dionysus.exceptions; - -public class WhatTheFuckException extends Exception { - - /** - * - */ - private static final long serialVersionUID = -2453004182880966130L; - -} diff --git a/src/main/java/net/persei/dionysus/exceptions/WrongVersionException.java b/src/main/java/net/persei/dionysus/exceptions/WrongVersionException.java deleted file mode 100644 index 9bfc9b2..0000000 --- a/src/main/java/net/persei/dionysus/exceptions/WrongVersionException.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.persei.dionysus.exceptions; - - -public class WrongVersionException extends LoaderException { - public final int version; - - public WrongVersionException(int version) { - this.version = version; - } - - private static final long serialVersionUID = -7423226308772215937L; - -} diff --git a/src/main/java/net/persei/dionysus/files/FileManager.java b/src/main/java/net/persei/dionysus/files/FileManager.java deleted file mode 100644 index e913749..0000000 --- a/src/main/java/net/persei/dionysus/files/FileManager.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.persei.dionysus.files; - -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import net.persei.dionysus.Setup; -import net.persei.dionysus.exceptions.LoaderException; - -public class FileManager { - public Setup loadSetup(String file) throws IOException, ClassNotFoundException, LoaderException { - FileInputStream fStream = new FileInputStream(file); - ObjectInputStream oStream = new ObjectInputStream(fStream); - Object obj = oStream.readObject(); - oStream.close(); - fStream.close(); - - if (!(obj instanceof SetupFileHelper)) - throw new NoSetupObjectException(); - - SetupFileHelper helper = (SetupFileHelper) obj; - - return helper.getSetup(); - } - - public void saveSetup(String file, Setup setup) throws IOException { - SetupFileHelper holder = new SetupFileHelper(); - holder.setSetup(setup); - - FileOutputStream fStream = new FileOutputStream(file); - ObjectOutputStream oStream = new ObjectOutputStream(fStream); - oStream.writeObject(holder); - oStream.close(); - fStream.close(); - } -} diff --git a/src/main/java/net/persei/dionysus/files/NoSetupObjectException.java b/src/main/java/net/persei/dionysus/files/NoSetupObjectException.java deleted file mode 100644 index 1d29420..0000000 --- a/src/main/java/net/persei/dionysus/files/NoSetupObjectException.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.persei.dionysus.files; - -import net.persei.dionysus.exceptions.LoaderException; - -public class NoSetupObjectException extends LoaderException { - private static final long serialVersionUID = -1038208370780426596L; - -} diff --git a/src/main/java/net/persei/dionysus/files/SetupFileHelper.java b/src/main/java/net/persei/dionysus/files/SetupFileHelper.java deleted file mode 100644 index c77ce9e..0000000 --- a/src/main/java/net/persei/dionysus/files/SetupFileHelper.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.persei.dionysus.files; - -import java.io.Serializable; - -import net.persei.dionysus.Setup; - -public class SetupFileHelper implements Serializable { - private static final long serialVersionUID = 223487487950538107L; - - private Setup setup; - - public Setup getSetup() { - return setup; - } - - public void setSetup(Setup setup) { - this.setup = setup; - } - -} diff --git a/src/main/java/net/persei/dionysus/managers/Command.java b/src/main/java/net/persei/dionysus/managers/Command.java new file mode 100644 index 0000000..b0d5590 --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/Command.java @@ -0,0 +1,6 @@ +package net.persei.dionysus.managers; + +public interface Command { + void execute(); + String getName(); +} diff --git a/src/main/java/net/persei/dionysus/managers/CommandManager.java b/src/main/java/net/persei/dionysus/managers/CommandManager.java new file mode 100644 index 0000000..793d52c --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/CommandManager.java @@ -0,0 +1,54 @@ +package net.persei.dionysus.managers; + +import java.util.LinkedList; +import java.util.List; + +public class CommandManager { + static private class CommandTuple { + public final Sequence sequence; + public final Command command; + + public CommandTuple(Sequence sequence, Command command) { + this.sequence = sequence; + this.command = command; + } + } + + private List commands = new LinkedList<>(); + private Sequence sequence = new Sequence(); + private long lastChange = 0; + + static private long maxInterval = 1 * 1000; + + public boolean registerEvent(Event event) { + if (System.currentTimeMillis() - lastChange > maxInterval) + sequence = new Sequence(); + sequence.add(event); + lastChange = System.currentTimeMillis(); + return checkForCommand(); + } + + private boolean checkForCommand() { + boolean result = false; + for (CommandTuple ct : commands) { + boolean check = true; + for (Event event : ct.sequence) + if (!sequence.contains(event)) { + check = false; + break; + } + if (check) { + System.out.println("Executing " + ct.command.getName() + "..."); + ct.command.execute(); + result = true; + } + } + return result; + + } + + public void addCommand(Sequence sequence, Command command) { + System.out.println("Adding command " + command.getName() + " on " + sequence); + commands.add(new CommandTuple(sequence, command)); + } +} diff --git a/src/main/java/net/persei/dionysus/managers/Event.java b/src/main/java/net/persei/dionysus/managers/Event.java new file mode 100644 index 0000000..a9beb3c --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/Event.java @@ -0,0 +1,55 @@ +package net.persei.dionysus.managers; + +public class Event { + static private boolean velocitySensitive = false; + + private MidiSource source; + private boolean press; + private int channel; + private int x; + private int y; + private int v; + + public Event(MidiSource source, boolean press, int channel, int x, int y, int v) { + this.source = source; + this.press = press; + this.channel = channel; + this.x = x; + this.y = y; + this.v = v; + } + + public static boolean isVelocitySensitive() { + return velocitySensitive; + } + + public static void setVelocitySensitive(boolean velocitySensitive) { + Event.velocitySensitive = velocitySensitive; + } + + public boolean equals(Object obj) { + if (obj == null) + return false; + if (!(obj instanceof Event)) + return false; + Event event = (Event) obj; + if (event.source != source) + return false; + if (event.press != press) + return false; + if (event.channel != channel) + return false; + if (event.x != x) + return false; + if (event.y != y) + return false; + if (velocitySensitive) + if (event.v != v) + return false; + return true; + } + + public String toString() { + return (press ? "press" : "release") + " on " + source + " x:" + x + ", y:" + y + ", v:" + v; + } +} \ No newline at end of file diff --git a/src/main/java/net/persei/dionysus/managers/MidiManager.java b/src/main/java/net/persei/dionysus/managers/MidiManager.java new file mode 100644 index 0000000..57cce13 --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/MidiManager.java @@ -0,0 +1,104 @@ +package net.persei.dionysus.managers; + +import javax.sound.midi.MidiSystem; +import javax.sound.midi.MidiUnavailableException; +import javax.sound.midi.Receiver; +import javax.sound.midi.ShortMessage; +import javax.sound.midi.Transmitter; + +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +import javax.sound.midi.MidiDevice; +import javax.sound.midi.MidiMessage; +import javax.sound.midi.MidiDevice.Info; + +public class MidiManager { + + private CommandManager commandManager; + + public MidiManager(CommandManager cm) throws MidiUnavailableException { + this.commandManager = cm; + + Info[] infos = MidiSystem.getMidiDeviceInfo(); + + System.out.println("Searching for midi devices..."); + for (Info info : infos) { + MidiDevice device = MidiSystem.getMidiDevice(info); + if (info.getName().contains("MPD18")) { + System.out.println("Found MPD18: " + info.getName()); + if (device.getMaxTransmitters() == 0) + continue; + if (!device.isOpen()) + device.open(); + devices.add(device); + Transmitter transmitter = device.getTransmitter(); + transmitter.setReceiver(new MPD18Listener()); + continue; + } + if (info.getName().contains("S")) { + System.out.println("Found Launchpad: " + info.getName()); + if (device.getMaxTransmitters() == 0) + continue; + if (!device.isOpen()) + device.open(); + devices.add(device); + Transmitter transmitter = device.getTransmitter(); + transmitter.setReceiver(new LaunchpadListener()); + continue; + } + System.out.println("Found nothing: " + info.getName()); + } + } + + public static final int MIDI_NOTE_OFF = 0x80; + public static final int MIDI_NOTE_ON = 0x90; + + private List devices = new LinkedList<>(); + + private class MPD18Listener implements Receiver { + @Override + public void close() { + } + + @Override + public void send(MidiMessage m, long timeStamp) { + if (!(m instanceof ShortMessage)) + return; + ShortMessage message = (ShortMessage) m; + boolean press = message.getCommand() != MIDI_NOTE_OFF; + int x = message.getData1() & 0x03; + int y = (message.getData1() >> 2) & 0x03; + handle(press, MidiSource.MPD18, message.getChannel(), x, y, message.getData2()); + } + } + + private class LaunchpadListener implements Receiver { + @Override + public void close() { + } + + @Override + public void send(MidiMessage m, long timeStamp) { + if (!(m instanceof ShortMessage)) + return; + ShortMessage message = (ShortMessage) m; + boolean press = !(message.getCommand() == MIDI_NOTE_OFF || message.getData2() == 0); + int x = message.getData1() & 0x0F; + int y = (message.getData1() >> 4) & 0x0F; + handle(press, MidiSource.LAUNCHPAD, message.getChannel(), x, y, press ? 127 : 0); + } + } + + public void close() { + for (MidiDevice device : devices) { + device.close(); + } + } + + private void handle(boolean press, MidiSource source, int channel, int x, int y, int v) { + System.out.println(press + " on " + source + ": " + x + ", " + y + " - " + v); + commandManager.registerEvent(new Event(source, press, channel, x, y, v)); + } +} \ No newline at end of file diff --git a/src/main/java/net/persei/dionysus/managers/MidiSource.java b/src/main/java/net/persei/dionysus/managers/MidiSource.java new file mode 100644 index 0000000..cc55f02 --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/MidiSource.java @@ -0,0 +1,5 @@ +package net.persei.dionysus.managers; + +public enum MidiSource { + MPD18, LAUNCHPAD +} diff --git a/src/main/java/net/persei/dionysus/managers/PlayerManager.java b/src/main/java/net/persei/dionysus/managers/PlayerManager.java new file mode 100644 index 0000000..dbce4c0 --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/PlayerManager.java @@ -0,0 +1,49 @@ +package net.persei.dionysus.managers; + +import java.util.HashMap; +import java.util.Map; + +import net.persei.dionysus.players.AudioPlayer; +import net.persei.dionysus.players.Player; +import net.persei.dionysus.players.PlayerType; +import net.persei.dionysus.players.VideoPlayer; + +public class PlayerManager { + static private PlayerManager instance; + + static public PlayerManager getInstance() { + if (instance == null) + instance = new PlayerManager(); + return instance; + } + + private PlayerManager() { + } + + private Map players = new HashMap<>(); + + public Player create(PlayerType type, String name) { + return create(type, name, false); + } + + public Player create(PlayerType type, String name, boolean fullscreen) { + System.out.println("Adding " + type + " player '" + name + "'" + (fullscreen ? " in fullscreen mode..." : "...")); + Player player = null; + switch (type) { + case Audio: + player = new AudioPlayer(name); + break; + case Video: + player = new VideoPlayer(name, fullscreen); + default: + break; + } + if (player != null) + players.put(name, player); + return player; + } + + public Player getByName(String name) { + return players.get(name); + } +} diff --git a/src/main/java/net/persei/dionysus/managers/Sequence.java b/src/main/java/net/persei/dionysus/managers/Sequence.java new file mode 100644 index 0000000..d786fac --- /dev/null +++ b/src/main/java/net/persei/dionysus/managers/Sequence.java @@ -0,0 +1,10 @@ +package net.persei.dionysus.managers; + +import java.util.LinkedList; + +public class Sequence extends LinkedList { + public Sequence append(Event event) { + add(event); + return this; + } +} diff --git a/src/main/java/net/persei/dionysus/players/PlayerType.java b/src/main/java/net/persei/dionysus/players/PlayerType.java new file mode 100644 index 0000000..3f6911e --- /dev/null +++ b/src/main/java/net/persei/dionysus/players/PlayerType.java @@ -0,0 +1,5 @@ +package net.persei.dionysus.players; + +public enum PlayerType { + Audio, Video +} diff --git a/src/main/java/net/persei/dionysus/players/VideoPlayer.java b/src/main/java/net/persei/dionysus/players/VideoPlayer.java index 947e79d..9f3d19f 100644 --- a/src/main/java/net/persei/dionysus/players/VideoPlayer.java +++ b/src/main/java/net/persei/dionysus/players/VideoPlayer.java @@ -22,13 +22,14 @@ public class VideoPlayer extends JFrame implements Player { private boolean loop = false; private boolean fullscreen = false; + private String name; public boolean isFullscreen() { return fullscreen; } - public VideoPlayer(boolean fullscreen) throws HeadlessException { - this(); + public VideoPlayer(String name, boolean fullscreen) throws HeadlessException { + this(name); dispose(); if (fullscreen) { setExtendedState(JFrame.MAXIMIZED_BOTH); @@ -36,8 +37,10 @@ public class VideoPlayer extends JFrame implements Player { } setVisible(true); } - public VideoPlayer() throws HeadlessException { + public VideoPlayer(String name) throws HeadlessException { super(Main.TITLE); + + this.name = name; setBounds(100, 100, 600, 400); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); setVisible(true); @@ -78,4 +81,8 @@ public class VideoPlayer extends JFrame implements Player { public EmbeddedMediaPlayer getMediaPlayer() { return player.getMediaPlayer(); } + + public String getName() { + return name; + } } diff --git a/src/main/resources/keep b/src/main/resources/keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/java/keep b/src/test/java/keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/test/resources/keep b/src/test/resources/keep deleted file mode 100644 index e69de29..0000000 diff --git a/target/classes/net/persei/dionysus/AudioPlayer.class b/target/classes/net/persei/dionysus/AudioPlayer.class deleted file mode 100644 index 5eb9cd46cafeda4bbd6d81584678df74e7b1ded2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1477 zcmbVL+fEZv6kVscY0FT`U0MYZkant!paKelhQ#<#(TJ%L6O*AFaj?ux+9?VDd`|P#XUhB-yUtfO!n8!m65rGLu`lcuA4QZRZw(A@Eiu}w?II*MA5IK7Xt#(La~y9z>tm<(!3hc(F0w>C4t5No2XHnqu!(ty;yZ+q`cd#{BnoLtwHTre?qhZq#m+l_JESG)c0=kL?<@ zCNQmI2G<2Ld(sccDNrmF!yIVYV+O9SXej(;bxYtL7`UOKBrp>q%taU-H!&xW;)p^Q zD1`X(Cd4ZC`5pB`6K8Yf1s%88vAAb78bT7(T0{CRHDZPBVueHZblk@h)uzx3 z=}F6HQ>N)IiL$94&=9E+@`Tb`ZnIvMEG9`1P<@UsW0C}p(if*O!tT-!6yc|%W_ma@ zCn?^G42^xXd#i2&IpY*rBYKQMqjZd6;~Pd_pJMD7xz8&1GL0jI3&MyIVoG6TFh(d> zR4hVc4&#`hnO9tm{s~-Fthkn`_CVbDg29h;5COv`=olDKFq}dc+AspwIz*qeiDr!x zOqHVFF?)t$6tBAU(uBt(`$)?!rEG^%mI$;ckyBKMDJ{1tr5W`M^8)Aba@1-*z%AY3 zM(&2A+_{J{PAC(hD2rHXqm+q1caSymYy%O>pJ6!?V3Z*ZK$^rcMeL{l(Iwl>!qaco sMqW^RvYv#`onYk?p#-&`4KPb~`dh_=c7D*f;q%F*Kyuf(HC1B$H^8$GfB*mh diff --git a/target/classes/net/persei/dionysus/Main.class b/target/classes/net/persei/dionysus/Main.class deleted file mode 100644 index fe4fd7157fdabe41a4343e5876505846d50edc2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmah|TTc@~6#j-5mM)8wLb0HTh?jDa5pRe^jNxKPY9(oHqCSx6cC3Tj-DY>&*uUa$ z@I@ZLOQP@oDC3!hf`lgSCNq2Hob!F(oOAZ~pYJ~bEa9nv9)^r7L*9^nAQi7F&us_I zfWHvRH4tY=?unM*j&N)IWo1v=AwzFzyOiH#Naas`#n4x7Eypmp?zurI+^{U1rtC+8 zp?~8Tl_Ak^L|gjLUu`o?<+~B@bOH#gZ&kS}Tw{o3XUh!nb+0N-#E`ULVUS@cuUuJZ z)+^F4iHak&B+nL3S@=rZ$A|Ioy$Tp6y7K9Z5>>oTJHuG^?fFY-ZgcaaEgKvNxlh&OBOC;k}C5~xm5}!b#%oyCNfASa23}KOrI%z zu^oi6Zea%3Db#CH7t%*UmB)9e^dU7sih3@Ao5&it#W3Ccz-^D)qTwrB@Rnom@e0vV zo3y&JV_TTT9EsR26id$v>(tSi{C|^j1H`ak;Wiej+>WXc@NP|pyDgd^Di6bGcJ_P? zP29m<14|4e(a@ZgZQ&m7GZ-Y*4IRQrXU{`KBOv@56>FqRmkc~&Sm>g^ssh_1b!}b{ zp=!yEj%{KYNxkGOtVZqVgi^nYUemYbmeNy|&_lAQbz_>k7o(r22jl2PA6Z6Z^~0oh zfWBjNM$<{_1+qBpjP~BSLkxY1LWgP9iJ;UJt=3ThMlecN0%?p9{6+eXlP43w6zN1~ zOn$}0Ck*^R=Jg@2{MyIVK5l%&Ji`I_DSV1jfnlOaQTiwiTlycWNj$(q@|$`H30CWz fCj$Kt^fE!O9N_V1GJ6Q5qc#&k=rD#Sk#FrUsqz95 diff --git a/target/classes/net/persei/dionysus/MidiTrigger.class b/target/classes/net/persei/dionysus/MidiTrigger.class deleted file mode 100644 index dc175c83b48ad8a85dbb437d6d35ff176bcccd9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmaivu};HK3`MWgq=8Uq#1Eiuz`zqThy{r$(1EJ^OJW6A;RU@UNPHF(5(6K=Mh2SiimLHcrY*Qdlpkm=id6UH}_J@%1hI*PZ1OHjeWJIwXQMC za>La?m|lyM;f63dJzEpv+pgve6YS5BU`m)5;`m{FF4?ba*)rj{=qlT;t(TDhn(^=? zJz-Joz_=o0kKO1izLRh)|A%-H=&*pY=wnc)z@VCHGTRI!=O5U6*G7a)HH@JP2dcAe Oov0sbA{?nknEwK1IzurFp++!JGM7S-vQ8hcyR_$$79)0W8y3j{<5dy*@*9WZ%U1sX}C1=wR zLhIA2stG4?vLj4tp&x9)gqt}1#W#(!WwuJTgrGxuUWRe4TQ6|rxfybTc-K+$jGIT^ zTRp5NByp0qugX-)=-OGM)uAxC>cZHmKj=!*#Qdb+BzGyUe=P{pP1QQXL($o=;;!RD qf>e_)0U|kgj1b-75hlH!V%qEMN6&EH&vRV#y1=D430LxtaQzK7XHo3{ diff --git a/target/classes/net/persei/dionysus/PlayerGUI$1.class b/target/classes/net/persei/dionysus/PlayerGUI$1.class deleted file mode 100644 index 7d7fbb6b78e734f20561c123ac2ed93c9aa9e777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1052 zcmbVLZBG+H5Pp`PTsaS@Rj4l@FIFueEXDWKn3x6(NiihV^2IO9-KH#F_nNyc$j{O! z5fi;Gr)hP6t(#kw% zSgf2AyVPQE>TxK?z;MyW1&n&gVcds{35Hz7223`Tmalr9eVM!#`;lZQHsU};Es-dD z9vB^4Aj87&l;tWFIDVY=spVlBS6!4CW{39f;~K6raX7qbjc z{~N@|oMqZgWF$pOb6CJF7mEyqjFCv_HgBG!Ms|FZahqlm_YA{SpD-2k-9%~AG>H_Q zS{`#ADp+>0#BezS_&dVK3hq%h>Q$Ra6V8D7ejY>ScE(%{8T@UnWm1nsn#vUOB*Yy3I;>Ez zYNXu=y)N=(AEVt9I$Mjkyz-eoU*LbpVkWIE^Dw%%iUOT|x?`=EP^6U@!Ic5Z-T}-m9FJ({kvGdZ7(E+1v13Hy5bi0EKmc1@)Nlz&1GJFD#HoQa7l#17EY=1T6v<=B0p6nh z)0w_Qf0UVGhIZNq=)3R=ot~9UVuHC$Gh=CYwcpwEoju=|fByaBZvZ2xrqCg9$Wx(J zRkc7lmhJf7v!EVWbFO@*YB!dODI^7Ut;r4f)C!(B-a~7)P?PH_g)V`E?++Eo2CC*r zw@hTBE)}N)#H_&1N#6@X>4jzK)>Y@?X#d9RpI)C9=&D9%3QUyhkFAPtRb;j1RHU`x zR@OLQulkw$y>@kov_s{f~p@Vy>`ODN#r8E!|A7?@~F*1C_{2j=8AEgY2XwF1bPA$E^$M}uW^H|!_OEv zt3PGfN&@48?2Y|5U>75Nuu_LYHaI{W?nKBZP=-3=#QDs!8T zmRe^GGHGB6({cK=A2kZ+q(_1FHS^IIpg&07el5!A253f@3RV71ON{1C3m(Alo z{kq*r`pEALe2*U(rng492;|zB?p_-o>Uv%!x~|#n*eu1QhSX;$0~K9FomE*6lwNsc zU=>5!hw}pY4~o{JFEP`yQen*wj|klVr~}$v#V5D5%z|I9Rg_kb7d;oXO17A@I#D*a zqDK!+x-tkkMAAa(}!Jr_H$D$A{jIu^}=jHdbuwrF7*<4x15 zg_f){n_06&+oL>u7o|v)*|sR`lueX#O)ly9qMhHEO>D&2=Qms8(=m(eHFnyyX8iGH qe5cN3docgEL~zKa@fhwqA@tVvkp4FzWU(Fvd+_rGWE^08KM=))1!CgJ8pA@PiOHx74Eq5ZD2^R6?U?vkF4V+@AK*tB zZwD8~1l#m+Z_hnFJ^lQ8{{Ya!frSi1MRM&;d91kbh9Z(rDp6jS>ttGQS;#T0O@hb3 zOSA|*U&wnt^o7z4c|8`YenJHPT!uEmPK6Y@!?4%*2Y1+G$el++UI4?Ag9YSmWKncr zp~R4F9QGFB5=KUn+k{zhu!=QGOcOO`Sa0~L$}o^4@3ueT1Kl>9Wm3#d~>emZ8uUBN^x!a zi?kMKcZLjgz-=DAz;3?5X|9xCvHVQA4AyBb&FZPTNEIb)P|itNTx?>Cq8zqU^bRWN Sx{GR>-J`ii!+eLimD)Ex@QrE! diff --git a/target/classes/net/persei/dionysus/Setup.class b/target/classes/net/persei/dionysus/Setup.class deleted file mode 100644 index 75a6bdd54adf6a64603fec7992138b43b062f7c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1506 zcmb7@>rc~A7{;HoTUjahn=plO5x0R9yz9n3Kw`3FQIi=GK6c||7HUV<&V>I;6A4ih z<7fXU<8!(TWm^m`>3ZIC&ii{W&)eUBzW)TUhoXjvz@jUC^ISGPX`3f@!@clYo>`H8 z>s&)jVDi-ZWSNfT*3GxoQ(5x`blbK41E*0t^LSnkF0_2xG0V2+=LM1#yY5YRVkQZJI|kxNsMV5z zBoZ3#3Z#Zr9yEGmPe%&NioPPSoEh4q;ATF1q^PR~M%(;#17jE$m?+z>eAD_^mCg57 z)nVtS%Z-}l99d0U*`3Xp|G{QYQvZk`FjkkolAI~ABi}~!{ z5*E^Tg#HyJF}3J=2UFV7bQHUIq+w5BJS>&x8+eQ-l$QPibD2`7w$OyP61@EdoPAvbYXq}QI_}2gpVm4eZF-Oh$`of#wlDk<_zvS3 zpCYmhSSALGLa*smydb1&c-w3EZWwilx7g=i9)w>ZWO;=ML(87;g)0KdLUEVeUbO1c zLK5RPE+AuKLLjF#bj$ktvaX6-$YOjL0vBxz!x9*+c)r|-4yv-V<5rtme5>X*cioPs zzPm;veCJWi^dNG&v*ea($Z#_X+fk_KGAmms_K9TF(tpPDDL09}p{JDlhoDE;os-fw zWg~?l0Trr-Ay8oGxyGi_@7get7D%@{^0nLWY65G8LFq5u&@B%N&|@pU6|mMm)MPv4 zN(LrM0u#MGJNBe8&-upNYGDEQO*mY;v*@qOCO6*Z9eBt(ZoR(c20^9O5LiD4`5upM zA5YwX_;QqsyB3@C$i@<8x!nhGXHuTeL9^$B^y>z3OF1YGV_>Lm6$Na!qE1b|^3+CJ zdb1W3M`MZ{lDz6k7;4Bo8ERVk&4s3Sgy#fo`h>a*e2&tx$_&BxSm}trpUA#BLhdUj zKkMjAd}cImns_73NaHeXcASGNxXLeqYq(DAxWWyM>(HujQ>8DM{KP{73QQGOkUfyp zG008aqF0eRnVj!W9zQjC8n;hLzSEzaJ2iO*v*cG`WrH9^&0&kORYNm#*}2kp+$+t^ vf5YNOT4E&@-yoVv{z^?gj_#^a8Xw~c(bVZFo*}`1R&EF_y*dKVHD38Ia>7d) diff --git a/target/classes/net/persei/dionysus/blocks/BlockCondition.class b/target/classes/net/persei/dionysus/blocks/BlockCondition.class deleted file mode 100644 index cffc19cc0592d0c04bc1e2d3ab2f7d78ef3b3e5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3877 zcmbVP?Q>jJ8ULN^-R#Zgrb)MHN($)~Yo5-H>C%stO} z&h!3u&i?g3fBG|k2T%;5N+Fi9o%WoapS4r%6RB+G+-zaCeLS5_PS3XY$QLRuvl*-t{g_&_Xf7}{R zQ*UG_o3zrSRz4+rAE`N~Q?m-@&}R-a0~X9#%!k4~(NAMLWI0w>?4&~Y@Y$rDlN8N{ zaG%0~^>o=~n)ahsdNP}zu_spNw=5-um_pBOgoyT0D_yXMv(CXeE0q?f%OWISrX*9> zv5TRL3ZmV>{dj<>N@XVOv&Sa?M?nkWFhwzQt1ghFYJ8=`f-Sk%t-*mk=9Bx zy~gNTSN8#!VOG&21|G#ACCsEU$L;)#!rn>=zN4QZ`(YfwV+MwBlznF9a&~4y;jZY( zwaR__yM*JIa6GQCYaOMZ&iSN)5gb?0ovdf1LSu9-ixhDxlPhpM?7XcP?007-$1#wl z`AjS05=^GE(g6YHla7tsELd)X)}&+Sbv#RACtu*qh`=&1jwFfL%AIuX)Q zpu%2J^d$plagISvWgK72|5py|i!W1Xw~nvSi{2g`U*+1(_3Mn-1Y1_reZ#;v#V=#Z zcFJuW#<%fe2p1JLu2lYD#<8dDyn*jX-|FsIA})mQDr{dN^Tyx+XNu)ijDSn14dEq) zO)He;Qyo8)z}ikB*EZ`|4wLdS^W!4IxQw5M@Du7-ZwUF9lUQ!x3Vuez=*Z!WlV=E5 zHKN}}mBIJxA%v?6&Fe`Y5tG80$29{#cPpL3M?4FENed;2ZBloy8h8!AV%??f%#?H5 zy|ftrH#me`3&p+=78L4S_X|!c&B>dq#hduGfw%D+a!~XqOfJ=H#f{{n!ib`l>bznk z^R!KW>pjAfboO1->TBp+u5=acSxwqqp~4T;T1;=3j(1s6ck`AR$rkcSdmtru-KN!7 zN1M2aovf_@pB5}Rxg!Zx6XqSjZw+_P^R$XS*yB^+GVt!Si-)WLb_SgCW_eK8B7FPJg7QB97S|@hL&;QM052AIJktv@#dhp zgn=TCG>3{9F5-!!3m;#ICj_}jyFAbP=qa!T2Db9Gb0_XV3!!cNZpVFGJLqpWJ?x{8 zN9fzc_c1dk;BtC!Ax~y7$*s7Jn6s} zcp9Y47`{lTnv%EU8LoUo%1y>^DY8-OXJo5hCOxY`ePl+)ia0foptfj67!?5n1Sc8e zS6B>Yz=IjD1ihX|bKLYWZoE7knT6+c1&_c!&sC2{FlC;rqD54mad}!@Jp%hYqC~c3 zh6|)kyRk;hb<6$2rv7fVGAI{?;T;xOS3cBzX z*SA@7@1h5PLofcpSIWQn4%2W@CD5n#pkF=1H`gQ%tCujKuHX@M6OXFD@D=rUJmyyS z4zJ!y)vZ2qtCs&B2uYn+@yC1CpGFr+tpf?qzxw`uan|K-0K0i@Mfph ztnKM&d}Ux&c2z7RLHFK?uL%C*&V*w3h%iR G-v2KovYJu= diff --git a/target/classes/net/persei/dionysus/blocks/BlockHelper.class b/target/classes/net/persei/dionysus/blocks/BlockHelper.class deleted file mode 100644 index c3606812b2fff56298ed3d7fb2d812a3ef193e44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 zcma)5T~8B16g@+?-Lh0@`KVSw1QA8Z-sA zt_*zYD5qTgTlguHhtAT=2-F<3oZ;?MHQR4DKOc6T1UB_&2Asc zM%4|Kg&c-W%m|DQ!Wzh6R!`@Sz|>_ddn1^}d$O1K^;;dPVD759 zb=yyADE3B=|H2@sq9BsfAR6(o2BKU&J?V5WJbG-XsD$jlf+9;Ks)cjD8w1o)@`_f{ zPS9!BjY zdfmtw#m|@d6@7B47 n0+v``0uQiEE5@i8V@s^I$ecZEg)v!r^)S1SX-hCtw`uh^RU#5p diff --git a/target/classes/net/persei/dionysus/blocks/BlockType.class b/target/classes/net/persei/dionysus/blocks/BlockType.class deleted file mode 100644 index 2f85c372588190dfa9dd565715aa740cb7cc1c06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1201 zcma)5-%ry}6#g#V)@>9R6Nd~Ce;{lFsZ$}wEd(Tx5C@nPmMlJXrDCzPOMeje?jNM% z0iu!k>>p)3_flD3Oty!e``w=No$u>8{r%_rHGnGCWDGIPJ7%DEOwTth_1JQqt{?hp z+jfmlzWRoT!*0ivkzg1-)z5X+)}0e|+X>GYly|!CTj!=oV_0YmLRDiJ-ZX-KS#Ha9 zj;(-N>vqI6z8Bho)v?XbmU9x_4R7xs?aeng8%Nt3!{Ylvo2Bc9Z8=u3&LEY_O@_pl zdu*nW%z|NDK^}J)QuQdMP-^sDYJo@nYrExUhH~#JNFtSn%)vbcG6!i6rWK?)$Z&99 zK?W&)dY~YSVTQ4W<(T{7S=;mu^|oy?buqs7T;Zs-~2j>TW%=;b zStpJjgdRP7731T@^}$50*EXs&If=fHL>e%VEAsJDW`d@#V1(*M z34I~Ve}_N7TKO^Q61fXZ2vA4}Fe$)PQh=fWGbsUP<)2g}^)R8e5TjRHTTr zjCpR2Huwn^qVhFr!OIIh%(dQ1mFrfWtK5^OudulMm7d&4x?y9t5;8RFm58H4IlNak X&nj0?e}VnKZV1l>=L<5#xmW)JyJinj diff --git a/target/classes/net/persei/dionysus/blocks/ConditionalBlock.class b/target/classes/net/persei/dionysus/blocks/ConditionalBlock.class deleted file mode 100644 index 18dbb8514afad1556f36d0aeb724b30215698ffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmaJ-yH3ME5S(@F7)(MC5(>w{Lo-;|qv6`2r+TFeR7@Q#}Wg=@$+*B1FgpLm4t~ RBsl8xMB-Q&;aD)jvsSTu~CF0uo9@mo2n>Q+S}D(a2Tht=TE}n ze(XJ$i7X;7&=|`P(woR&>K!|XrAi6lJOq3%c!AR zf;K~-=xb@Dk{3Y|9SW?s z=d9adI&&#IO$AqRy@+c9)l*5A(ay|loW7)J1*{Gol?`3&K6L%@xM?6g#LKZtL+yk55hDWs+ZclNy&V&2j+6H#>dO?YYI5# z1-Ta)Iap$rg(!2aF!MBvfkyWTZuc8%?~l;dGnpj9*4>a6aB=31JudJk=C33Nzu(ESCq$J0Ro diff --git a/target/classes/net/persei/dionysus/blocks/DelayBlock.class b/target/classes/net/persei/dionysus/blocks/DelayBlock.class deleted file mode 100644 index 8c2e457cf50b4eff6d98ed32560958b97724f622..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1430 zcmah}YflqF6g|_|(q*Mm9szt%6rtTBE55ae%1gltBs4YZr)@ha17+KEw?zJve$a@B zCdSYH5`Ts9&a~+&CTl5pGuz5$rSmWB|+6^DCPgEw6+tcs{Rhi=QY zO0{}<&$X6$%|2X|v4#jkDqySH#SnLEoHq($pEIy^2BXToZ9f%GXDAt2s#ka%47~=T zh%qGc!r>dO{St2$>{5+tllgktt`+U3kn2t|;_V2RVLBhc!>631?(SdRBkA=_ks&rO z9N{f65SyZoFop~yF%TtF=okLkgHZDF$m?c&fdGNfFl2AIbxF#K%V;D;RD?C%|#SPrj zaFd}=+0t!k;5P1%&vvD9s&=!q%gbIa^NRTH+f`9!SV;$oU$#9v7qmf=S9to$n=)^B zG|H}qd4>W1sJdTtEZ~ubhvbs~wXoCVcE!MB^b;#J$Wqyofn}_a3L0gpVlDHB2OS;K zqbCNQVvWX2I0yAT8j{KX3sU-p(`XU$M36cqpAK6d$bYsfBWQrP>#b&)uL^mc68<#L zO2L?*feF*JGlb+7q$onMh8}vxX=PEK(K~8>g#M0#5Da?8R8qqkijDRL^dUhjauWUY zl*J1KEx}{v_!0E?6t$~$dIP=G&`=1&Y8~q!NOVbs{y5}y>|pIGV!(`fj6rh{!-Qxi zM~*ONe!#^eOcKHAugJbkUOk3&g6ko?@H>tvX$iuJP+!TgA0vdGC467QOjpBQ+#^o+ ziKVn7r_{Wrj8ro!t@w-wvSIiHiy?eRHv0*yZ%+vvCLc!>e5zg86*!7@JR@KNLmtlw Km|;UzZ~g{oRzrRO diff --git a/target/classes/net/persei/dionysus/blocks/IfElseBlock.class b/target/classes/net/persei/dionysus/blocks/IfElseBlock.class deleted file mode 100644 index a71dd742f2f8fdc4703adb36c3891fac8b625748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1446 zcmb7E+fvg|6kR7xNiX461aF{#h)t_RylVj!D2i5nfT<&IX&UN*kaU`akx%dw{0Coj zL(Oy=x;&f068wRg{tpI^QKn8h;%62r7(`Fhi8c^22}+;#T6 zz|(8CYi@h`>So#YtVIzhkQs_GXO~>3&V4Fi*dc%+ZT?OXvJwLg&qw$YL(d#{xWB+K zlm8E#R%MWv+`5%P0$CLbRE9)etESM$knOlk8Vmy}29YC#W9(QAxyqKYYv{J&H1svU z#hpeejT0DAFw8L3P5k;^(^7E~r>Jgpk;sVYu9pya;$t|Y;;g75`;-xhF%?Plh}C%& z!*Kpz6SQg; z1zc88WatYmiU?I)!3;TU)a!p?U(~iN(=TZoDO{yF@LNHfjG@269qW0pQ?pv@M$Hb5 zcTK~t8Z9p3qonM==5)o_?sxQ)MkcvqG`Pu7j>Rk+zEO(nhOmfqlSSn>rqvYl>?yd* zF!X0UqMZy%m{%~zpvAa;e7aRE;6BN18uX8&$?7gw+YlXisA3UIL(A0^E=yEi4i2PY|gO+KnaM8noj$X_NqcA}O zo1j;QK@#&zD~Z+$QuIwz^cFH@fce4!GKF04KKctEF|?16ORitdC01ImaC=)^l({EU0=Ff1gZ&{9a@d$1((w=xqfN3-}PS^oooT cxsWj4E*VMC@d%HJl4!7sCxm2pN|A)hFV)m@&;S4c diff --git a/target/classes/net/persei/dionysus/blocks/InitialBlock.class b/target/classes/net/persei/dionysus/blocks/InitialBlock.class deleted file mode 100644 index b93dbecd42cdc1b2d504434409817f30ae108af7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1255 zcma)5T~8B16g^W~wropVmf}ZIOZ}oPlog4INeL!sO-KqplwkC2+fLSjx@~r6jr=Dc zG*L(-@dx;$jCZCR+~CIeva|Qjx#ymHX6EOw?>_)+V#`2^Vb$Z(o^U_l!XApTcN&C& z-5-qyCxN}^2`QY>u8It#8CL!Q)+mOo^o8pZA492o?0j(SP>PY=6@hFs%=LupIWqJ) z!`7AU?QRnLz8H$bDP?=i`ur4Jl3#I)DxfYJFXZobdpVoX=^8%5COW5$F&u;L{!{MhUG-e z)J~Eqyh$h-l9}Ry$oSqk^auQV1e5u|H0>~!)nEzNXl1yL8^k^Ba8vWz zlvS8a^D7oU(@zSDObJnxe@HTyBo!K5&%33Xf31k^lDnd$|qq^x$(vhJ>(;oj?( zwYsj>W{aJn@rfYQ29}0fH0L7eE0eAz-K;sKiJB21DrjjjRn)OT)mfUt#v|>=rsjM6 E8|}h79RL6T diff --git a/target/classes/net/persei/dionysus/blocks/Lane.class b/target/classes/net/persei/dionysus/blocks/Lane.class deleted file mode 100644 index d3c243a03a2d38793e832839bc9d94bef01362eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1919 zcma)7TUQ%Z7~Llf3>n5!F6AbrluMh7WxTXS4WMnI(we4KYAQTAOpaknI>VZobk!IC zgm3-=0OE7FGz+?S=J#;lv$*lwT1r0{02w1{-ji z(nb>bL6ye6OJ2ub()4C0&ZrxQ%Y~kYlpr#{w5SYEnDcqtc_{(o0u0EZZBQ1D=Vsi7UnRkFf%s#RPuTnB^Q{_ zbRyd*UbftaH?Uyh3VWp;K2B^nc#|b^E3D^B{2I+w$ZoOlx(5YjP7g(9e(*HhWi{tI zGFx>MSA$z?&pf%8u-#)5ivmNf{yw_t#d~DI{L0uu0m~+q1TLM{wCl3QVY0D;4+JbK zeBj1$F{}!#pHA&$rP@vobEETm!^TbAV#oW5jNBxQ1V#>9LQmkG=6RtHYxu~-ZO%Ze z3Wv8g*1^Ft0{M(H_Ht7-*!MN)0D>CU+_H!cy-Kt_Rg9=qJaF&mP{LK|d|eayQSX`g9vVW8g%143#CiUzxb4nU$DN1%*Lhlt zRnA{(xxh^BIlsSSZu2=V?PDzW69zVoFQ{Z6mvi}jOtln^Fg?I1J<}9FMk?dPo6wPz zGNLtUs+CHWQkO-pNqChu%F0%1^9RVM@Ti4u>AUkx^;8?8eS~Q9-|KCS_ztep_8O54 z?yu`)e8Undc8mGJcXKcBzOk%=9N-K@Hx95W@F(t;uH(pMj!zhU%0MeT}2RGBR)V7pEV?1I1(nQ%!FEg!2TP* z?A8W~waW6FRsJZ;)14HAO)74slIgyE``k09Pv3m~_U|VEm+;m?NMO`cfn8K3U%7V9 zEqL30*|*p7h3tlJFREbH37i={vk(y&YLRTR1R^=^5Qt~qJ6n#Ocf56bF(|p-dRid7 zp|%Cur(MqtZnE@PV^U)zxlGVIg`A2Z3@H&s7m>!2%Te?Q$SOx=s&_!3Pa=+XZtPFVI_k<#OQW?TqUOX$$9>-=b)S8>1Ly9Sspf0!b}PO5j)%MU%^& zn82ik3j*EdQ1(kn*tkeBom}oedmpX6SJ@z)d?C=2aXqzA-dt0qC1)+K^w}1&PJY=b zxq4m;MuK-P-zM2gt$IJv4sDyxx|yUxEg4K3Ue=sFPop;NRl zN24Bu?m7NDhGUq8)Qs*)+{f=M=Iybb4nfsOHtuT* zHG#(xPw@y$R&wq;LUA!y{*CqO_TWXA#1m_xt<|8-0H-QB?MaL7*}Zb z9>`3IdHDT@-OHO=bMVyR)ag1+Y8|XGa+83u#X`B1Rd-!|H~Q*5KB;SCnAbndjvL~K zJ;03E70i=o4BZ}Loc)Q2$+J_t=uE}CE9g!AjUyGDOpRACkeaAqF!c|HJ|eLiAKAs& z9>zmh`O5%Z;_o1v4Il~AMZj+Kp$GlwWl!qEB)j5et`1d8;0msC1~vdqMVOH$7vgvd z*ZBOIu?T0^4Y>-(5k}_6<2QCN{TVY07rx*$XCE=Ux{JFzm|v+|BhdkV2lwzGj1^5g zyoX02d`4n?2a6vF73O~saLOpr&mzZ3`2+@V5+kHMg)@e5s#T~DKNA%j?>5fQ60~{FrbzOA9iQId+&F?^L^*+{pa65Ujz6OPh7+V(vj3bLpEDd z1r=3~Hd^gguu`j+S6e|*>Y@&{ylz4lj=*S#)Ap1=yk$}Zl7(mCdKlEgs2UV?Q$^LB zK=)M@DgC`bD*fN>Oi94GQLji3UFh}U!WZaDXG#h53-rCmrUwF__&A1c=0xF|?7?xQ zT$~UXKZ@h>Mnn1-#7TkPxw2O4yA29V6h0<3XKD}mIBftNO)#_YsgF3i&DV&JGZ^I{ z*t%?y=5D8Lt!hC*wRFzKS%EVhN)?!xz&OzjgoiOqm}w+>kw(@8hNdrDE-nciKk(H4P6C&W>!fZsJY2z5 z7i83Fyr#U5??4+Ss#4EKy17B|4|C)@Cf%E)i)&Q>F!4AP!(bNIecZrJfgXa}|A&J~ zrZXSfz^J+4;|KgG;Hs!1pD+FTKkDTT>@6R+Q6OiwYGLV*bUsruIEy}(@G~92k_IEc zSB?Iu27AnnkM8&=Vwr-eXuZBl3ydEvl<`hnMU6I*$2zHIWj*4IRaRj5P#il!iYFAG zynt7%x0_|TpsZQBYumQ>%z0x3HpG^BnF++q-^Z^Qzxk)|-NUE}hburfyA3a!?AydZ z_7#$wIF+5+#BlZxeD)W{9wa~C#uq!7jN#r(i!sgjX^ZC(p%)&^Rnx~iqaPUz;5_#S zcaag`0wdPomDqSirF5KC{bZpZk5>MTuO=597E;BoB+Y%&3c5vv`1qwwFh?%Hy|CqmKpv diff --git a/target/classes/net/persei/dionysus/blocks/SetupParser$Mode.class b/target/classes/net/persei/dionysus/blocks/SetupParser$Mode.class deleted file mode 100644 index d87f9165fad4ac9c4e240fd4329de225e741dc52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1284 zcmb7DT~8B16g}g%yKPyaR0Js?ejv8xV?hN!+8~5rLM&ji(4_HcTgJM$>^A#B?7!0T z0MST%_D31-3>Egp#O}k+oSA#?oO9>QuixJ;04(E`h8qlXE)R`1_XBPlhqmW-f+#Q= zj@SGY7$y&+_B)IA{Fxo^kZVXV3?5l0mf=`#%h+&W32 zgIei@j25cbqD*4rw#wVZTAE^S>qtUPK@;GP4o!fR024Y=0;C1Ft0N6n%zZKBy;_6LFd>6^i`{&Y*yjh9W~Y zCZrRD{8+~v<{8qK?^~Uw*X}Ts;&S&IN4y!9w__dnyF@LZYm%h)J}_*=(|TPh_H{2p z?vjoLEHkXct8F?~5R_vSuF7A_5oROXWK1veoBWL}TAGbHbWwzoP}6R?Rv7uT{W?}r zq*wZ4yGEz!+pf!fNsk8_UNFr5pUde|#fw>AB1-0#!bkv(r35#$4J6Jt8q?{ppiV+D$6B3L`FrJhkFTtcL!Ibucl9Vn+%zC1W zF|(fRB5&5!E~d;=On;@iH*lZ+85%(jenw|MkgH;c9!ZbIGHDPhw9?$<86I9IsuX}; zk}l^OW`rCn_6W1R^i`5B(nq_PuD?}E7xju@wxdj(Y+C~2t$3$#KJY}y2{K_W$3H(?74%LX?|$3E$3 zM@L_L*73y|XENhBBhry}MCp@t#__=iUmX7z^}8EFafqWn+}%Cro^$SZzH`pqpZ@rE z2f$h66u1OBExj0D*X@FC#21acb+=F|#It5Tw_1p&^#;)9&8NHkw4>MS}5-eN|7On&f?+X@Az74Jq#`J;i0CAP`CZw{(UC zyz4SCfp{eOB&~GOHms$gXw5KA2J{S!znRn5izKU{;IP18tuysKn|MkyZ|ChbebEUp zVVL?}00qqg=l;b%v#b?omi38JZgtPmkD~%25I_r#D>(MI+EkKI(TWpHv#@R&EL2ym zH0KYdUWax(tDr-myB4g2o#7Ny#Yu!&Ju7dK($h8R`v=z{nM0?FE=1T3rfw}2mz{1% z_z`1{?Q*|I#cA{k)D=qEf>R@b=13wDJ(z$WXXtfOdiAL|hvyhof1{+CY>(i65-Ke` z6usd`zkolsZfbWq2aHEX@p{3H1R4QBR}W>=fDV2ilWWH8~Yb zsHsK;>AB|2moP{~f}%7gj$(dQx9B8R7{C$gi0M^{$tS_wP%)3!Xn036OEUTy!u(&Q zRB%(EqReq>-jb-%|Nk8B~7+(cW-eW{Gc-K~9to{(n?r#^wNjQb%^W0VGiUUxsm zPeb0IuWwKZDOH2_LyDW$-Hq`roc&n3yd6>+&pSe369cI-@>C2~6~k2Aq~e9DVw8&1 zL%i6tg_nB2AS5P9fLtD~F0Kx)FxQDPLS;0U(X@@Gxd*uVXd6MkuRXfw6G30dyYtzf z*?Vr$+Rcwau|by#J@2sOk{E@g)RPcNNsyGZl8$y9MwC(<&FIGww)#7m%UEo@56QiV8nJUARq0mObQxyg%c&oxN1z$y& yyN}EU&u>78Tr7~SPGVU=j2ZUxJ%AC8{X&fvbPq~$M9B*ljS diff --git a/target/classes/net/persei/dionysus/blocks/SplitterBlock.class b/target/classes/net/persei/dionysus/blocks/SplitterBlock.class deleted file mode 100644 index 801dc5d9193bd82c84ff9f7cfde7322ff76a21b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1550 zcma)6TT|0e5dOAJo6<&sf+$k7C~8|T@q#y^peQO@@d8#seF*ItJQ~tYk}~-2Z*WFu zeDH}EUvvZpopF5jC-`I3JpnJ3nd(Dwa`x=*xBKmP^5xryPXLbKp^gY4=Ze6r3C|bO ztjMbS)UW&Ij8iQ?@y&^vBZEMABWkNdBV?O+hhBvE8R^Pkh@j=h@+Dp_R4XEhC|V4} zkR(KN`BDoAhJj7kOo%zQD||v*@v%K`oAp3CW>NZqrK63ovk79619hYcTf<1sGiy!+ zo^)qN>e8tQFM&=%%2#b<6-qXVc66yawi34F)&Tzqv+^b7(QRNmdbkz4RugW8kl|J~ zIIm+^Dx%lG4(uc(g6diUgwEW?5cX|FR|>n(uVXi1b7RK__Fyj)WLFrop}ZS2k3~7K z^3w_A2%8!Pqqr;>*pCBDwrkG`LV827RtpZ{unv>Z--OX{hLcZg!eD_MCA43!JAte@ zVnLCrWI)(k{GS92NEk41T&2+hPDyAjN>_~6=VpXAY0o%eq1CeOlx$C`{kl;L9!b_i zp&3pC0~Uc?e#ZEbET}nqR+b5)xn>zI+JS8~b5QDH#tF&Mg|esxd^vm_=LsFZ)%NQ| z&GdqSix_1QNWL?6Q1u91KSdC#dTiZprEnQzIjuVggGDOc`RWtqvj5-h=BE|%Ed#ePLC_!B{&)z&SCadTNw-#K$i8N*gtT#W>N@?y zH6)Pb?5W#L3_uQ(IZ>^9WpPP{<8K(_A;ksyST|ArK>-o|iXqN#op;aqOWDsAR*;CE zUBte^d!#<1b?PJ9r_voO*pgYswq;~ikX=Pz1b3fBDAV)$``1Ex-xBhLcR09&V{gOE zC-}W1%o~TsYYP%6@Ol(UoI(o2FmRH6vTK-ZJIy;r#~>`OD2@X-!(Xb#vl!xam`^p{ zoeQ(RVoRJYmNulyT*U}sFt&(Y-LX|%B78>cpw_MJUqB=?0##@i(*U&bt{oYqVe)z!one6k;hFWTKns(&!(}iuO1R505%#@@DQ+Z#4otI6 Km3cqR{@@1y?S5?l diff --git a/target/classes/net/persei/dionysus/controlroom/ControlRoom$ControlRoomPanel.class b/target/classes/net/persei/dionysus/controlroom/ControlRoom$ControlRoomPanel.class deleted file mode 100644 index 6af9a0edb2d1ba4243cba8fe2a6349ba2b0d8f4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1554 zcmb7E%Tg0T6g{1U41@s!Xb==diI@j4LGhUwg&>$1ElVU-E{D(sqm!A`^hCt9pWqL; za;>GHF8ly@uKf>}>g~ycpjnv3^z`lSd+xdSp6+kIzI+9+fPw-aL&oB+R^^W1hPGwc z)}E*dt!!JaW1Eg`SF~Jx{)pz$w)sQd;--QC!^l(px&A^EyN0!`6})wZu;7lNnW5%!yH_MQUb>$f^ zF$8k<7ViVGRS`me2!4#HP%+BjkI4f=MZ@9`YL!jyJk~c&PRSPSGNq+ca%49a1Cl&L zwi^Qf)RJ-;tm=m4=Ilzv1tP1{j%7UvjxmWxZddzA7avbUWMA&MCV=NX1uj?I`VE+EFxD>$(uEQZlG zW_5o_D}h-BNrq$>JybCV56(D0zoeT*4wr zbDO()lG3tim!DBLM`H1MiE6H4YDGi1>3&?nH3e6jwQcRFxQ-j7CtEq z(qWOCrKC28q+*+48hvO%(LOWiBZSCNt?gBtdQ1OBEYq<9n_eQC%!zKI7cZS9c&oee zcEtYQ2f`C8!yS361}O7&yXKVnsv)mZxa~EWmy%;p^OnV(oT&@JsRivPymtjtbXooM zdigMc9t6o!JgYYxmN%H@e%hm0v@=N7B3VBAhZ4z;7)l&q_?>tD7>&{!n8tA$Rc{_b z1Y=|ca025EgxBOBptVFId4P%Jdrad{5dNn72Wy3b$j^cZD@eBpMO3(eaN!aX$VQE56TLeuN3ALCrl%Es0xx_6 zpF$H^5>34F%D3>&7x30Nr|boZiwUtw&zUnbo%!aQIsN|o^H%^jv08#bm=9&*wq&fN z@9z6i_(rA5ZAM`dM?oA#2X6gDe#mkOdBWgJ@k+dQ)uA6gcXzg8aUcnWmI!4)*l3(1 z+{~%a5A^qI97xF|Z4t)12HMp|_Og_WeGzyJn;}2m-Xzct;UWiAi3k%<1gR|S{aSDR zc>nDkp}6jcezHNBwEq#e<`MGsXkV6*!=Q;iTq5M`n%4`$WfLXzlvx@vF^VxlFGIZ> zrQyCJl^yw5C)gz<6~yW@M+#1y6pW%l)ajS8<&XcCY)4KCg8p=?v$;yLdvFZK8mpCd4r@j~j$OE>gE# zhKX)BGif*UFuCF|$;M3hp^Vpb8~Ph8-b)YmWc)~EqzpEqCU;zL-}&58=93pbv%hd2 zygWWVqS=&6%`6di&PPnGYo^`KSeAFAG;Yc*Uw6^crSc`x7iUqINierVF0dX5r6j{X z?UBttrkSlAU(Os1O&&{zo;uzu=!NF;LZ&lW&wQevSBo`o+1ucK)j7t1Gk=63$6B_Q z2Xa3La#L*#JH<9CPQHyv=L@P&96H9#5#}7{6Xx2eeawO`@LJ81jUtaRPFTSR#(9`0 z7}z8hc~nUL PdK-6m*ELr8U4iij|GPPA diff --git a/target/classes/net/persei/dionysus/exceptions/DataValueNotAvailableException.class b/target/classes/net/persei/dionysus/exceptions/DataValueNotAvailableException.class deleted file mode 100644 index 065ce0ab4815ce2e171e4d443bee7eb3705cc9c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmbtQJx{|h6ug%v4Qf+b3M}0a3m}BW(1|ah7Nnx63y|GSEiejB6+0FDEG8rdegHoT z@e%3A=HE@<-D^uY zi~senBSPysFN;)N>T1>Y-!U9i31ACso}(oU5TMCt$jrkESFDFNW5gX%b0FAzMdziy Y(q*h3fCYMtQC$aEL!TK(%;;g`3%h!8zyJUM diff --git a/target/classes/net/persei/dionysus/exceptions/LibrariesNotFoundException.class b/target/classes/net/persei/dionysus/exceptions/LibrariesNotFoundException.class deleted file mode 100644 index 2a95a296aed02019d41d3c28932cb6d9ed970318..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmbVIyG{c^3>+tS3Ce?n01XYI1B$FDQ4mca66ll$NWV!eSaj?~w|fD8i3%#D6np^R zfhhR|gzp4&G&Hjwdp-8}^>gt8U=Qn6lnDEly_#|A*r=&V?7hpJ;=2jYyfCLCGfs7C z*bNguNHRM;{;5?F5LU1CT&q~yOZ8hIv>m5L$0Lyyk&BZf0-X|?eNpt<`jL(^4&QGd z7H{2;M?&SmSmO@~E;bVI?d{BwDBoHYB484ureU cXg(ERT7r24M4&C$DB=(+=m?Y33YM_;1!6#PhyVZp diff --git a/target/classes/net/persei/dionysus/exceptions/MalformedBlockConditionException.class b/target/classes/net/persei/dionysus/exceptions/MalformedBlockConditionException.class deleted file mode 100644 index afb1f7fe40565225a0b7df6e6e3dfe29f1736dad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmbtQO)mpc6g{`?w9*f)Vq+r~5-hw}R|rKy$_CxP&RjgE?=|yggtf%ZkFk=7_yK-~ zy}uytG}v0$oO{pxI5+paeLlYeSi@`u1;VD~RE;?CY*b{Nz4e(_d=v6073S5Uj?Y{& zK)}$MR;?i=TQ0lsft0-c!jw)(|X3tnY%7z0@PV^vVLc8ZeIiTf? z@b6+Ny)d4z)%)jX9YXckWl6|;CO@|LmldnI3s`_WAO;iW5TGovBCLQ3$wUz~!Maq` hm;=Ge6B>`>k)~k201;>j*2j5(DYS)&&4LBYd;!p>ck}=N diff --git a/target/classes/net/persei/dionysus/exceptions/MalformedSetupFileException.class b/target/classes/net/persei/dionysus/exceptions/MalformedSetupFileException.class deleted file mode 100644 index f9e949672ec0ec3639055aeea6b782b2c85ce58e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmbVIF;2rk5S(@51UU`~0U9cx0t!yF5YYsXK!GNZ{$ek1$gwT^jNma8@BMMn_}O6_vBYJpvsO+5?faI<{jS73_Yz z)7{g<>OG;+H?gt1gxcErm{1=iA$zD{)`y1{p))iwpA^#xXQz4+F`+k10$HGCjqvYg z-CmlU&>#Na)DFQLB}Eo+>6NhjM*y3pcdS6ZEr}AA;G!XCQ<#GpsYDDdL0>wm;()vH cjP_%7r6X8AfCzL2{i=2`hn_GASJ1)27xsa1l>h($ diff --git a/target/classes/net/persei/dionysus/exceptions/UnexpectedDataTypeException.class b/target/classes/net/persei/dionysus/exceptions/UnexpectedDataTypeException.class deleted file mode 100644 index f8816adfa09ceb9c928bd82cf61b5af3a44b5a84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmbVJO-~b16g{_}v`i_sfP#|1#!; z6j2h?yVmK^^uw7ZC+2LV*(~EeRSmW2Uk3~RolOPX-TNPc8(p+P(PQ-CIx=y3(C5VPjDK?bOIzT#m=zR=hrd}1nx gjHZDCah_PDe#E9)pj=^|ZP%2UwH71=k3;X1D^K2(?f?J) diff --git a/target/classes/net/persei/dionysus/exceptions/WhatTheFuckException.class b/target/classes/net/persei/dionysus/exceptions/WhatTheFuckException.class deleted file mode 100644 index 01273eff638aad0125e3ceaaf354ae8b06fbcf6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmbVIyH3ME5S&fy80AfX0y;W~1Sf=`0nr2^fh-z=sV~k79~e8b&j>y%6%qv>Ku^hM z&>}V#P*Ks$?d;vo-0bV;^9z6-tazvpb`!R0%301vO-!0R=0&dfA>^qQmaD5s+fl^B zBD_8M>3VPoOE>ynt5_%3>i2@s%{enV4n$DKFHesNbVg_mM9b>L20AX-egD{+?Z5Tg zgxaA=j6EV$H#P%;Ge{>~M-}ZR>Sz!;zDfAJxEpge(&Ly3JwFY_K#Ps=@1|oTlN0v* zf227e)GyK^3wdbf2CIKX-kzt$I^?6WJi;1W)a3MpRj?qHsGuR(l#VJn;P#);nw3vF Xg7X20Kv%F?)-D#&6DI2vtYG;Ie