diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index af7c42b..18bafb7 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -5,7 +5,32 @@ on:
branches: [ master ]
jobs:
- package:
+ java:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Maven Package
+ run: mvn -P${{ matrix.profile }} package
+
+ - name: Create distribution
+ run: |
+ mkdir staging
+ mkdir staging/J3
+ cp -r target/lib/ staging/J3/lib
+ cp target/j3-*.jar staging/J3/lib
+ cp -r data/ staging/J3/data
+ cp -r animations staging/J3/animations
+ cp package/README.md staging/J3
+ cp package/win/j3.bat staging/J3
+
+ - name: Upload
+ uses: actions/upload-artifact@v4
+ with:
+ name: J3
+ path: staging
+
+ native:
strategy:
matrix:
include:
@@ -21,15 +46,15 @@ jobs:
exe: j3
runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
- name: Add msbuild to PATH (Windows)
if: runner.os == 'Windows'
- uses: microsoft/setup-msbuild@v1.0.2
+ uses: microsoft/setup-msbuild@v1.1
- name: Visual Studio shell (Windows)
if: runner.os == 'Windows'
- uses: egor-tensin/vs-shell@v1
+ uses: egor-tensin/vs-shell@v2
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
@@ -46,6 +71,9 @@ jobs:
# uses: gluonhq/gluon-build-license@v1
# with:
# gluon-license: ${{ secrets.GLUON_LICENSE }}
+
+ - name: Maven Package
+ run: mvn -P${{ matrix.profile }} package
- name: Gluon Build and Package
run: mvn -P${{ matrix.profile }} gluonfx:build gluonfx:package
diff --git a/.gitignore b/.gitignore
index c1228a0..3a5c4c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
/dist/
/build/
*.csv
-*.arff
\ No newline at end of file
+*.arff
+dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/deploy/win/appicon.ico b/deploy/win/appicon.ico
deleted file mode 100644
index 0cb869e..0000000
Binary files a/deploy/win/appicon.ico and /dev/null differ
diff --git a/deploy/win/launch4j.xml b/deploy/win/launch4j.xml
deleted file mode 100644
index a8d2534..0000000
--- a/deploy/win/launch4j.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- false
- gui
- ../../dist/J3-Full.jar
- ../../dist/J3.exe
-
-
- .
- normal
- http://java.com/download
-
- false
- false
-
- appicon.ico
-
- runtime
- true
- true
- 1.8.0
-
- preferJre
- 64/32
-
-
\ No newline at end of file
diff --git a/deploy/win/launch4j/LICENSE.txt b/deploy/win/launch4j/LICENSE.txt
deleted file mode 100644
index bf03c83..0000000
--- a/deploy/win/launch4j/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/deploy/win/launch4j/bin/COPYING b/deploy/win/launch4j/bin/COPYING
deleted file mode 100644
index 60549be..0000000
--- a/deploy/win/launch4j/bin/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) 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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. 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.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
-
- 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
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) 19yy
-
- 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 2 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, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This 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 Library General
-Public License instead of this License.
diff --git a/deploy/win/launch4j/bin/ld.exe b/deploy/win/launch4j/bin/ld.exe
deleted file mode 100644
index 5985c0e..0000000
Binary files a/deploy/win/launch4j/bin/ld.exe and /dev/null differ
diff --git a/deploy/win/launch4j/bin/windres.exe b/deploy/win/launch4j/bin/windres.exe
deleted file mode 100644
index 855b195..0000000
Binary files a/deploy/win/launch4j/bin/windres.exe and /dev/null differ
diff --git a/deploy/win/launch4j/head/LICENSE.txt b/deploy/win/launch4j/head/LICENSE.txt
deleted file mode 100644
index e95c830..0000000
--- a/deploy/win/launch4j/head/LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Launch4j (http://launch4j.sourceforge.net/)
-Cross-platform Java application wrapper for creating Windows native executables.
-
-Copyright (c) 2004, 2015 Grzegorz Kowal
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-Except as contained in this notice, the name(s) of the above copyright holders
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/deploy/win/launch4j/head/consolehead.o b/deploy/win/launch4j/head/consolehead.o
deleted file mode 100644
index 60bb62f..0000000
Binary files a/deploy/win/launch4j/head/consolehead.o and /dev/null differ
diff --git a/deploy/win/launch4j/head/guihead.o b/deploy/win/launch4j/head/guihead.o
deleted file mode 100644
index 7cff132..0000000
Binary files a/deploy/win/launch4j/head/guihead.o and /dev/null differ
diff --git a/deploy/win/launch4j/head/head.o b/deploy/win/launch4j/head/head.o
deleted file mode 100644
index d5d63d6..0000000
Binary files a/deploy/win/launch4j/head/head.o and /dev/null differ
diff --git a/deploy/win/launch4j/launch4j.jar b/deploy/win/launch4j/launch4j.jar
deleted file mode 100644
index 6daad70..0000000
Binary files a/deploy/win/launch4j/launch4j.jar and /dev/null differ
diff --git a/deploy/win/launch4j/lib/XStream-LICENSE.txt b/deploy/win/launch4j/lib/XStream-LICENSE.txt
deleted file mode 100644
index 4848b3e..0000000
--- a/deploy/win/launch4j/lib/XStream-LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-(BSD Style License)
-
-Copyright (c) 2003-2004, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/deploy/win/launch4j/lib/xstream.jar b/deploy/win/launch4j/lib/xstream.jar
deleted file mode 100644
index 392e1c9..0000000
Binary files a/deploy/win/launch4j/lib/xstream.jar and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/MinGW.LICENSE.txt b/deploy/win/launch4j/w32api/MinGW.LICENSE.txt
deleted file mode 100644
index aea85bd..0000000
--- a/deploy/win/launch4j/w32api/MinGW.LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-MinGW - Licensing Terms
-
-Various pieces distributed with MinGW come with its own copyright and license:
-
-Basic MinGW runtime
- MinGW base runtime package is uncopyrighted and placed in the public domain.
- This basically means that you can do what you want with the code.
-
-w32api
- You are free to use, modify and copy this package.
- No restrictions are imposed on programs or object files compiled with this library.
- You may not restrict the the usage of this library.
- You may distribute this library as part of another package or as a modified package
- if and only if you do not restrict the usage of the portions consisting
- of this (optionally modified) library.
- If distributed as a modified package then this file must be included.
-
- This library 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.
-
-MinGW profiling code
- MinGW profiling code is distributed under the GNU General Public License.
-
-The development tools such as GCC, GDB, GNU Make, etc all covered by GNU General Public License.
diff --git a/deploy/win/launch4j/w32api/crt2.o b/deploy/win/launch4j/w32api/crt2.o
deleted file mode 100644
index f81f836..0000000
Binary files a/deploy/win/launch4j/w32api/crt2.o and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libadvapi32.a b/deploy/win/launch4j/w32api/libadvapi32.a
deleted file mode 100644
index c471853..0000000
Binary files a/deploy/win/launch4j/w32api/libadvapi32.a and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libgcc.a b/deploy/win/launch4j/w32api/libgcc.a
deleted file mode 100644
index d3f8947..0000000
Binary files a/deploy/win/launch4j/w32api/libgcc.a and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libkernel32.a b/deploy/win/launch4j/w32api/libkernel32.a
deleted file mode 100644
index 5d3eb07..0000000
Binary files a/deploy/win/launch4j/w32api/libkernel32.a and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libmingw32.a b/deploy/win/launch4j/w32api/libmingw32.a
deleted file mode 100644
index d1f7888..0000000
Binary files a/deploy/win/launch4j/w32api/libmingw32.a and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libmsvcrt.a b/deploy/win/launch4j/w32api/libmsvcrt.a
deleted file mode 100644
index 6714146..0000000
Binary files a/deploy/win/launch4j/w32api/libmsvcrt.a and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libshell32.a b/deploy/win/launch4j/w32api/libshell32.a
deleted file mode 100644
index d35fbda..0000000
Binary files a/deploy/win/launch4j/w32api/libshell32.a and /dev/null differ
diff --git a/deploy/win/launch4j/w32api/libuser32.a b/deploy/win/launch4j/w32api/libuser32.a
deleted file mode 100644
index 387fb65..0000000
Binary files a/deploy/win/launch4j/w32api/libuser32.a and /dev/null differ
diff --git a/package/README.md b/package/README.md
new file mode 100644
index 0000000..062e2a6
--- /dev/null
+++ b/package/README.md
@@ -0,0 +1,20 @@
+# J3 - 3D Interactive Visualization in Java
+
+## Usage
+
+### Prerequisites
+
+1. Download and install Java 17+
+2. Download and install JavaFX SDK - https://gluonhq.com/products/javafx/
+3. Set the environment variables `JAVA_HOME` and `JAVAFX_HOME`
+
+### Launch App
+
+```bash
+
+# Windows
+java --module-path %JAVAFX_HOME%\lib --add-modules javafx.controls --class-path "lib/*" j3.GUI
+
+# Linux
+java --module-path ${JAVAFX_HOME}\lib --add-modules javafx.controls --class-path "lib/*" j3.GUI
+```
\ No newline at end of file
diff --git a/deploy/debian/DEBIAN/control b/package/debian/DEBIAN/control
similarity index 100%
rename from deploy/debian/DEBIAN/control
rename to package/debian/DEBIAN/control
diff --git a/deploy/debian/usr/local/bin/J3 b/package/debian/usr/local/bin/J3
similarity index 100%
rename from deploy/debian/usr/local/bin/J3
rename to package/debian/usr/local/bin/J3
diff --git a/deploy/debian/usr/local/src/J3/appicon.png b/package/debian/usr/local/src/J3/appicon.png
similarity index 100%
rename from deploy/debian/usr/local/src/J3/appicon.png
rename to package/debian/usr/local/src/J3/appicon.png
diff --git a/deploy/debian/usr/local/src/J3/bin/J3.sh b/package/debian/usr/local/src/J3/bin/J3.sh
similarity index 100%
rename from deploy/debian/usr/local/src/J3/bin/J3.sh
rename to package/debian/usr/local/src/J3/bin/J3.sh
diff --git a/deploy/debian/usr/share/applications/J3.desktop b/package/debian/usr/share/applications/J3.desktop
similarity index 100%
rename from deploy/debian/usr/share/applications/J3.desktop
rename to package/debian/usr/share/applications/J3.desktop
diff --git a/deploy/mac/appicon.icns b/package/mac/appicon.icns
similarity index 100%
rename from deploy/mac/appicon.icns
rename to package/mac/appicon.icns
diff --git a/deploy/mac/build.xml b/package/mac/build.xml
similarity index 100%
rename from deploy/mac/build.xml
rename to package/mac/build.xml
diff --git a/deploy/mac/lib/appbundler-1.0.jar b/package/mac/lib/appbundler-1.0.jar
similarity index 100%
rename from deploy/mac/lib/appbundler-1.0.jar
rename to package/mac/lib/appbundler-1.0.jar
diff --git a/package/win/j3.bat b/package/win/j3.bat
new file mode 100644
index 0000000..e37c193
--- /dev/null
+++ b/package/win/j3.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java --module-path %JAVAFX_HOME%\lib --add-modules javafx.controls --class-path "lib/*" j3.GUI
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index a12a5a6..d16d731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,16 +22,19 @@
org.openjfx
javafx-controls
${javafx.version}
+ provided
org.openjfx
javafx-swing
${javafx.version}
+ provided
org.openjfx
javafx-graphics
${javafx.version}
+ provided
org.apache.commons
@@ -56,7 +59,7 @@
org.dom4j
dom4j
- 2.1.3
+ 2.1.4
org.apache.groovy
@@ -72,6 +75,21 @@
maven-compiler-plugin
3.8.1
+
+ maven-dependency-plugin
+
+
+ prepare-package
+
+ copy-dependencies
+
+
+ provided
+ ${project.build.directory}/lib
+
+
+
+
org.openjfx
javafx-maven-plugin
diff --git a/src/main/java/j3/GUI.java b/src/main/java/j3/GUI.java
index 5fd7fb2..007cb13 100644
--- a/src/main/java/j3/GUI.java
+++ b/src/main/java/j3/GUI.java
@@ -108,6 +108,10 @@ public void start(Stage primaryStage) throws Exception {
FileChooser.ExtensionFilter filter = new FileChooser.ExtensionFilter(reader.getDescription(),
reader.getFileExtensions().stream().map(s -> "*." + s).collect(Collectors.toList()));
fileChooser.getExtensionFilters().add(filter);
+
+ if (reader instanceof SmartReader) {
+ fileChooser.setSelectedExtensionFilter(filter);
+ }
}
File selectedFile = fileChooser.showOpenDialog(primaryStage);
diff --git a/src/main/java/j3/Launch.java b/src/main/java/j3/Launch.java
new file mode 100644
index 0000000..a4c9e71
--- /dev/null
+++ b/src/main/java/j3/Launch.java
@@ -0,0 +1,11 @@
+package j3;
+
+public class Launch {
+
+ public static void main(String[] args) {
+ // Note: Having a separate class that launches the application appears necessary to avoid
+ // errors about missing JavaFX Runtime when executing from the JAR.
+ GUI.main(args);
+ }
+
+}