diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 865cbd6d..77ada5e9 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -13,37 +13,19 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Use Node.js
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: 18
- name: Setup pnpm
- uses: pnpm/action-setup@v2.2.4
+ uses: pnpm/action-setup@v4
with:
version: latest
- run_install: false
- name: Cache
id: cache
uses: actions/cache@v3
with:
path: testSets
key: ${{ runner.os }}-test-sets
- - run: pnpm build-cli
+ - run: pnpm build:cli
+ - run: pnpm i
- run: pnpm test -- --sets-dir testSets --sync-dir syncfiles --set cc2lp1 --set CC2LP1V
- desktop-artifact:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- - name: Use Node.js
- uses: actions/setup-node@v3
- with:
- node-version: 18
- - name: Setup pnpm
- uses: pnpm/action-setup@v2.2.4
- with:
- version: latest
- run_install: false
- - run: pnpm build-desktop
- - uses: actions/upload-artifact@v3
- with:
- name: NotCC desktop
- path: desktopPlayer/artifacts
diff --git a/.gitignore b/.gitignore
index 5c791769..94b791c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,8 +107,9 @@ original.bmp
*.pb.*
-desktopPlayer/bin
-desktopPlayer/.tmp
-desktopPlayer/artifacts
-desktopPlayer/NotCC.app/Contents/MacOS
-desktopPlayer/NotCC.zip
+# Neutralino browser binaries
+gamePlayer/bin
+gamePlayer/neuDist
+gamePlayer/artifacts
+gamePlayer/NotCC.zip
+.tmp
diff --git a/.prettierrc b/.prettierrc
index 41889ed6..4e6e3cdd 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -2,5 +2,6 @@
"arrowParens": "avoid",
"semi": false,
"singleQuote": false,
- "trailingComma": "es5"
+ "trailingComma": "es5",
+ "plugins": ["prettier-plugin-tailwindcss"]
}
diff --git a/LICENSE b/LICENSE
index 13343eb6..53d1f3d0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,675 @@
-MIT License
-
-Copyright (c) 2020 Lubomir
-
-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.
-
-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.
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
+
diff --git a/cli/package.json b/cli/package.json
deleted file mode 100644
index 300273d9..00000000
--- a/cli/package.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "name": "@notcc/cli",
- "version": "0.1.0",
- "description": "A CLI for verifying NotCC solutions!",
- "main": "./dist/index.js",
- "scripts": {
- "build": "tsc",
- "dev": "tsc --watch"
- },
- "type": "module",
- "bin": {
- "notcc": "./dist/index.js"
- },
- "author": {
- "name": "G lander"
- },
- "license": "MIT",
- "dependencies": {
- "@notcc/logic": "workspace:^",
- "@types/progress": "^2.0.6",
- "ini": "^4.1.1",
- "picocolors": "^1.0.0",
- "progress": "^2.0.3",
- "prompts": "^2.4.2",
- "yargs": "^17.7.2"
- },
- "devDependencies": {
- "@types/ini": "^1.3.32",
- "@types/node": "^15.14.9",
- "@types/prompts": "^2.4.7",
- "@types/yargs": "^17.0.29",
- "typescript": "^4.9.5"
- }
-}
diff --git a/cli/src/commands/c2gShell.ts b/cli/src/commands/c2gShell.ts
deleted file mode 100644
index 22939fba..00000000
--- a/cli/src/commands/c2gShell.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { ScriptRunner, C2G_NOTCC_VERSION, ScriptInterrupt } from "@notcc/logic"
-import { errorAndExit } from "../helpers.js"
-import { createInterface } from "readline"
-import fs from "fs"
-import { resolve } from "path"
-import pc from "picocolors"
-import { Argv } from "yargs"
-
-const inf = createInterface({ input: process.stdin, output: process.stdout })
-function question(prompt: string): Promise {
- return new Promise(res => {
- inf.question(prompt, ans => res(ans))
- })
-}
-
-function resolveInterrupt(runner: ScriptRunner, interrupt: ScriptInterrupt) {
- if (interrupt.type === "chain") {
- const c2gPath = resolve(
- process.cwd(),
- interrupt.path.replace(/^~/, process.env.HOME ?? "")
- )
-
- if (!fs.existsSync(c2gPath)) {
- errorAndExit("A chain path must lead to a file!")
- }
- const c2gData = fs.readFileSync(c2gPath, "latin1")
- runner.handleChainInterrupt(c2gData)
- return
- } else if (interrupt.type === "script") {
- console.log(interrupt.text)
- runner.scriptInterrupt = null
- return
- } else if (interrupt.type === "map") {
- console.warn("`map` interrupts aren't supported in the shell.")
- runner.handleMapInterrupt({ type: "skip" })
- return
- }
-}
-
-async function startC2GShell(): Promise {
- console.log(
- pc.green(`NotCC C2G Shell version ${pc.bold(`${C2G_NOTCC_VERSION}`)}`)
- )
- const runner = new ScriptRunner('game "C2G shell"')
- runner.executeLine()
-
- // eslint-disable-next-line no-constant-condition
- while (true) {
- const newScriptLines: string[] = []
- let scriptLine: string
- let firstLine = true
- do {
- scriptLine = await question(firstLine ? "> " : ". ")
- newScriptLines.push(scriptLine.replace(/\\$/, ""))
- firstLine = false
- } while (scriptLine.endsWith("\\"))
- runner.scriptLines.push(...newScriptLines)
- runner.generateLabels()
- let interrupt: ScriptInterrupt | null
-
- while ((interrupt = runner.executeUntilInterrupt())) {
- resolveInterrupt(runner, interrupt)
- }
- }
-}
-
-export default (yargs: Argv): Argv =>
- yargs.command("c2g", "Launches a C2G shell", startC2GShell)
diff --git a/cli/src/commands/index.ts b/cli/src/commands/index.ts
deleted file mode 100644
index 877cd0b9..00000000
--- a/cli/src/commands/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import c2gShell from "./c2gShell.js"
-import statLevel from "./statLevel.js"
-import verifyLevels from "./verifyLevels.js"
-
-export default [c2gShell, statLevel, verifyLevels]
diff --git a/cli/src/commands/statLevel.ts b/cli/src/commands/statLevel.ts
deleted file mode 100644
index 70b47903..00000000
--- a/cli/src/commands/statLevel.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import fs from "fs"
-import { parseC2M } from "@notcc/logic"
-import { ArgumentsCamelCase, Argv } from "yargs"
-
-interface Options {
- files: string[]
-}
-
-export function statFile(args: ArgumentsCamelCase): void {
- for (const filePath of args.files) {
- // This weird uint8 loop is because node is dumb
- const dataBuffer = new Uint8Array(fs.readFileSync(filePath, null)).buffer
-
- const data = parseC2M(dataBuffer)
- console.log(
- `${filePath}:
-CC2 level, ${data.name ? `named '${data.name}'` : "unnamed"}
-Level size: ${data.width}x${data.height}, time limit: ${
- data.timeLimit === 0 ? "untimed" : data.timeLimit + "s"
- }${
- data.associatedSolution
- ? `, has inline solution (${data.associatedSolution.steps?.[0].length} steps)`
- : ""
- }
-Has a ${data.camera.width}x${data.camera.height} camera, blobs have ${
- data.blobMode ?? 1
- } seed${data.blobMode && data.blobMode !== 1 ? "s" : ""}`
- )
- break
- }
-}
-
-export default (yargs: Argv): Argv =>
- yargs.command(
- "stat ",
- "Gets stats about a level",
- yargs =>
- yargs
- .usage("Usage: $0 stat ")
- .positional("files", {
- describe: "The files to read",
- coerce: files => (files instanceof Array ? files : [files]),
- })
- .demandOption("files"),
- statFile
- )
diff --git a/cli/src/commands/verifyLevels.ts b/cli/src/commands/verifyLevels.ts
deleted file mode 100644
index eacdc040..00000000
--- a/cli/src/commands/verifyLevels.ts
+++ /dev/null
@@ -1,354 +0,0 @@
-import { exit } from "process"
-import { resolveLevelPath } from "../helpers.js"
-import { MessageChannel, MessagePort, Worker } from "worker_threads"
-import { join, dirname } from "path"
-import os from "os"
-import pc from "picocolors"
-import ProgressBar from "progress"
-import { ArgumentsCamelCase, Argv } from "yargs"
-import { decode } from "ini"
-import { readFile } from "fs/promises"
-import { fileURLToPath } from "url"
-import { protobuf } from "@notcc/logic"
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
-const levelOutcomes = ["success", "noInput", "badInput", "error"] as const
-
-type LevelOutcome = (typeof levelOutcomes)[number]
-
-interface WorkerLevelMessage {
- levelName: string
- outcome: LevelOutcome
- desc?: string
- type: "level"
- glitches: protobuf.IGlitchInfo[]
-}
-
-export type WorkerMessage = WorkerLevelMessage
-
-export interface ParentNewLevelMessage {
- type: "new level"
- levelPath: string
-}
-
-export interface ParentEndMessage {
- type: "end"
-}
-
-export interface ParentInitialMessage {
- type: "init"
- port: MessagePort
- firstLevelPath: string
-}
-
-interface OutcomeStyle {
- color: "red" | "green" | "yellow"
- desc: string
-}
-
-interface WorkerData {
- worker: Worker
- promise: Promise
-}
-
-const outcomeStyles: Record = {
- success: { color: "green", desc: "Success" },
- badInput: { color: "red", desc: "Solution killed player" },
- noInput: { color: "red", desc: "Ran out of input" },
- error: { color: "yellow", desc: "Failed to run level" },
-}
-
-interface Options {
- verbose: boolean
- ci: boolean
- files: string[]
- sync?: string
-}
-
-abstract class VerifyStats {
- constructor(public total: number) {}
- success = 0
- roundedPercent(num: number): number {
- return Math.round((num / this.total) * 1000) / 10
- }
- abstract getTextStats(): string
- abstract addLevel(
- msg: WorkerLevelMessage
- ): [meesage: string, verboseOnly: boolean]
-
- getExitCode(): number {
- const failureN = this.total - this.success
- const exitCode = failureN === 0 ? 0 : 1 + ((failureN - 1) % 255)
- return exitCode
- }
-}
-
-function glitchToString(glitch: protobuf.IGlitchInfo): string {
- const glitchLocation = glitch.location
- ? `(${glitch.location?.x}, ${glitch.location?.y})`
- : ""
- const glitchName = glitch.glitchKind
- ? protobuf.GlitchInfo.KnownGlitches[glitch.glitchKind]
- : ""
- const glitchSpecifier =
- glitch.glitchKind === protobuf.GlitchInfo.KnownGlitches.DESPAWN
- ? glitch.specifier === 1
- ? "replace"
- : "delete"
- : ""
- return `${glitchLocation} ${glitchName} ${glitchSpecifier}`.trim()
-}
-
-class VerifyStatsBasic extends VerifyStats {
- success = 0
- badInput = 0
- noInput = 0
- error = 0
- getTextStats(): string {
- return `${this.total} Total
-${pc.green(`${this.success} (${this.roundedPercent(this.success)}%)`)} ✅
-${pc.red(`${this.badInput} (${this.roundedPercent(this.badInput)}%)`)} ❌
-${pc.blue(`${this.noInput} (${this.roundedPercent(this.noInput)}%)`)} 💤
-${pc.yellow(`${this.error} (${this.roundedPercent(this.error)}%)`)} 💥`
- }
- addLevel(msg: WorkerLevelMessage): [string, boolean] {
- const style = outcomeStyles[msg.outcome]
- const outcomeMessage = pc[style.color](
- `${msg.levelName} - ${style.desc}${msg.desc ? ` (${msg.desc})` : ""}`
- )
-
- const glitchMessage = pc.yellow(
- msg.glitches
- .map(glitch => `\n${msg.levelName} - ${glitchToString(glitch)}`)
- .join("")
- )
-
- this[msg.outcome] += 1
- return [
- outcomeMessage + glitchMessage,
- msg.outcome === "success" && msg.glitches.length === 0,
- ]
- }
-}
-
-function arraysEqual(aArr: T[], bArr: T[]): boolean {
- if (aArr.length === 0 || bArr.length === 0) {
- return aArr.length === bArr.length
- }
- return aArr.every((a, i) => a === bArr[i])
-}
-
-export interface SyncfileConstraints {
- outcome: LevelOutcome
- glitches?: string[]
-}
-
-export type Syncfile = {
- _default: SyncfileConstraints
-} & Partial>
-
-class VerifyStatsSync extends VerifyStats {
- success = 0
- mismatch = 0
- constructor(total: number, public sync: Syncfile) {
- super(total)
- }
- getTextStats(): string {
- return `${this.total} Total
-${pc.green(`${this.success} (${this.roundedPercent(this.success)}%)`)} ✅
-${pc.red(`${this.mismatch} (${this.roundedPercent(this.mismatch)}%)`)} ❌`
- }
- getConstraintsForLevel(level: string): SyncfileConstraints {
- if (level in this.sync) return this.sync[level]!
- return this.sync._default
- }
- addLevel(msg: WorkerLevelMessage): [string, boolean] {
- const mismatchReasons: string[] = []
- const constraints = this.getConstraintsForLevel(msg.levelName)
-
- if (constraints.outcome !== msg.outcome) {
- mismatchReasons.push(
- `Expected ${constraints.outcome}, got ${msg.outcome}.`
- )
- }
-
- const glitchStrings = msg.glitches.map(glitch => glitchToString(glitch))
-
- const despawnsMatch = arraysEqual(
- glitchStrings ?? [],
- constraints.glitches ?? []
- )
- if (!despawnsMatch) {
- mismatchReasons.push(
- `Expected [${(constraints.glitches ?? []).join(", ")}], got [${(
- glitchStrings ?? []
- ).join(", ")}]`
- )
- }
-
- const mismatch = mismatchReasons.length > 0
-
- const style = outcomeStyles[mismatch ? "badInput" : "success"]
- if (!mismatch) {
- this.success += 1
- return [pc[style.color](`${msg.levelName} - Success`), true]
- }
-
- this.mismatch += 1
- return [
- pc[style.color](
- mismatchReasons.map(reason => `${msg.levelName} - ${reason}`).join("\n")
- ),
- false,
- ]
- }
-}
-
-interface VerifyOutputs {
- logMessage(message: string): void
- levelComplete(msg: WorkerLevelMessage): void
-}
-
-function makeBarOutput(stats: VerifyStats, verbose: boolean): VerifyOutputs {
- const bar = new ProgressBar(
- ":bar :current/:total (:percent) :rate lvl/s",
- stats.total
- )
-
- return {
- levelComplete(msg) {
- const [message, verboseOnly] = stats.addLevel(msg)
- if (!verboseOnly || verbose) {
- bar.interrupt(message)
- }
- bar.tick()
- },
- logMessage(message) {
- bar.interrupt(message)
- },
- }
-}
-
-/**
- * The test output will log numbers every TEST_OUTPUT_INTERVAL level completions.
- */
-const CI_OUTPUT_INTERVAL = 100
-
-function makeCiOutput(stats: VerifyStats, verbose: boolean): VerifyOutputs {
- let totalComplete = 0
- return {
- levelComplete(msg: WorkerLevelMessage) {
- totalComplete += 1
- const [message] = stats.addLevel(msg)
- if (verbose) {
- console.log(message)
- }
- if (totalComplete % CI_OUTPUT_INTERVAL === 0) {
- console.log(stats.getTextStats())
- }
- },
- logMessage(message) {
- console.log(message)
- },
- }
-}
-
-export async function verifyLevelFiles(
- args: ArgumentsCamelCase
-): Promise {
- const files = resolveLevelPath(...args.files).filter(val =>
- val.toLowerCase().endsWith(".c2m")
- )
- const filesN = files.length
-
- let syncfile: Syncfile | undefined
-
- if (args.sync) {
- const syncData = await readFile(args.sync, "utf-8")
- syncfile = decode(syncData) as Syncfile
- }
-
- const stats = syncfile
- ? new VerifyStatsSync(filesN, syncfile)
- : new VerifyStatsBasic(filesN)
- const output = args.ci
- ? makeCiOutput(stats, args.verbose)
- : makeBarOutput(stats, args.verbose)
-
- const workers: WorkerData[] = []
-
- const workersN = Math.min(filesN, os.cpus().length)
-
- console.log(`Creating ${workersN} workers...`)
- for (let i = 0; i < workersN; i++) {
- const { port1, port2 } = new MessageChannel()
- const worker = new Worker(join(__dirname, "./verifyLevelsThread.js"))
- // eslint-disable-next-line @typescript-eslint/no-empty-function
- let endWait: () => void = () => {}
- const promise = new Promise(res => {
- endWait = res
- })
-
- workers.push({ worker, promise })
- worker.postMessage(
- {
- type: "init",
- firstLevelPath: files.shift() as string,
- port: port1,
- } satisfies ParentInitialMessage,
- [port1]
- )
- port2.on("message", (msg: WorkerMessage) => {
- output.levelComplete(msg)
-
- const nextLevel = files.shift()
- if (nextLevel === undefined) {
- worker.postMessage({ type: "end" } satisfies ParentEndMessage)
- endWait()
- } else {
- worker.postMessage({
- type: "new level",
- levelPath: nextLevel,
- } satisfies ParentNewLevelMessage)
- }
- })
- }
-
- const stillWaiting = Promise.all(workers.map(val => val.promise))
-
- await stillWaiting
-
- console.log(stats.getTextStats())
-
- exit(stats.getExitCode())
-}
-
-export default (yargs: Argv) =>
- yargs.command(
- "verify ",
- "Verifies that a level's solution works",
- yargs =>
- yargs
- .positional("files", {
- describe: "The files to be tested",
- type: "string",
- coerce: files => (files instanceof Array ? files : [files]),
- })
- .demandOption("files")
- .option("verbose", {
- describe:
- "If set, prints successful levels too, instead of just the failed ones.",
- })
- .option("ci", {
- describe:
- "Whenever to log intermediate stats in a non-TTY compatible manner",
- type: "boolean",
- })
- .option("sync", {
- description: "Path to syncfiles to use",
- type: "string",
- })
- .usage("notcc verify "),
- verifyLevelFiles
- )
diff --git a/cli/src/commands/verifyLevelsThread.ts b/cli/src/commands/verifyLevelsThread.ts
deleted file mode 100644
index 52f75c7c..00000000
--- a/cli/src/commands/verifyLevelsThread.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import {
- createLevelFromData,
- GameState,
- parseC2M,
- protobuf,
- SolutionInfoInputProvider,
-} from "@notcc/logic"
-import { parentPort } from "worker_threads"
-import fs from "fs"
-import type {
- WorkerMessage,
- ParentInitialMessage,
- ParentNewLevelMessage,
- ParentEndMessage,
-} from "./verifyLevels.js"
-
-if (!parentPort) throw new Error()
-
-let waitForMessageResolver: (() => void) | undefined
-
-const queuedMesssages: any[] = []
-
-parentPort.on("message", val => {
- queuedMesssages.push(val)
- if (waitForMessageResolver !== undefined) {
- waitForMessageResolver()
- }
-})
-
-function waitForMessage(): Promise {
- if (queuedMesssages.length === 0) {
- return new Promise(res => {
- waitForMessageResolver = () => {
- res(queuedMesssages.shift())
- }
- })
- }
- return Promise.resolve(queuedMesssages.shift())
-}
-
-;(async () => {
- const response = (await waitForMessage()) as ParentInitialMessage
- const sendMessage = (message: WorkerMessage) =>
- response.port.postMessage(message)
-
- let levelPath: string | null = response.firstLevelPath
-
- // eslint-disable-next-line no-constant-condition
- while (true) {
- let levelName: string | undefined
- let glitches: protobuf.IGlitchInfo[] = []
- try {
- const levelBuffer = fs.readFileSync(levelPath, null)
-
- const levelData = parseC2M(new Uint8Array(levelBuffer).buffer)
- levelName = levelData.name || "???"
- const level = createLevelFromData(levelData)
- glitches = level.glitches
-
- if (!levelData?.associatedSolution || !levelData.associatedSolution.steps)
- throw new Error("Level has no baked solution!")
-
- level.inputProvider = new SolutionInfoInputProvider(
- levelData.associatedSolution
- )
-
- while (
- level.gameState === GameState.PLAYING &&
- !level.inputProvider.outOfInput(level)
- ) {
- level.tick()
- }
- sendMessage({
- type: "level",
- levelName,
- outcome:
- level.gameState === GameState.WON
- ? "success"
- : level.gameState !== GameState.PLAYING
- ? "badInput"
- : "noInput",
- glitches,
- })
- } catch (err) {
- sendMessage({
- type: "level",
- levelName: levelName || levelPath,
- outcome: "error",
- desc: (err as Error).message,
- glitches,
- })
- }
- const response = (await waitForMessage()) as
- | ParentNewLevelMessage
- | ParentEndMessage
-
- if (response.type === "end") {
- process.exit(0)
- } else {
- levelPath = response.levelPath
- }
- }
-})()
diff --git a/cli/src/helpers.ts b/cli/src/helpers.ts
deleted file mode 100644
index 1f751980..00000000
--- a/cli/src/helpers.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import fs from "fs"
-import path from "path"
-import { exit } from "process"
-
-export function getFilesRecursive(dir: string): string[] {
- const files: string[] = []
- fs.readdirSync(dir).forEach(file => {
- const absolute = path.join(dir, file)
- if (fs.statSync(absolute).isDirectory())
- files.push(...getFilesRecursive(absolute))
- else files.push(absolute)
- })
- return files
-}
-
-export function resolveLevelPath(...levelPaths: string[]): string[] {
- const values: string[] = []
- for (const levelPath of levelPaths) {
- const inputPath = path.resolve(process.cwd(), levelPath)
- if (fs.statSync(inputPath).isDirectory())
- values.push(
- ...getFilesRecursive(inputPath).map(levelPath =>
- path.resolve(inputPath, levelPath)
- )
- )
- else values.push(inputPath)
- }
- return values
-}
-
-export function errorAndExit(errorName = "", errorCode = 1): void {
- if (errorName) console.error(errorName)
- exit(errorCode)
-}
diff --git a/cli/src/index.ts b/cli/src/index.ts
deleted file mode 100644
index 240bd185..00000000
--- a/cli/src/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-import yargsF from "yargs/yargs"
-import { hideBin } from "yargs/helpers"
-import commands from "./commands/index.js"
-
-let yargs = yargsF(hideBin(process.argv))
-
-for (const func of commands) yargs = func(yargs)
-
-yargs.strictCommands().demandCommand().completion().recommendCommands().parse()
diff --git a/cli/tsconfig.json b/cli/tsconfig.json
deleted file mode 100644
index 52b47ece..00000000
--- a/cli/tsconfig.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "compilerOptions": {
- "esModuleInterop": true,
- "target": "ES2016",
- "module": "ESNext",
- "moduleResolution": "NodeNext",
- "resolveJsonModule": true,
- "sourceMap": true,
- "strict": true,
- "outDir": "dist",
- "lib": []
- }
-}
diff --git a/desktopPlayer/package.json b/desktopPlayer/package.json
deleted file mode 100644
index ed382e91..00000000
--- a/desktopPlayer/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "@notcc/desktop-player",
- "version": "1.0.0",
- "description": "The desktop runner of the web game player.",
- "scripts": {
- "build": "zx makeDists.mjs",
- "build-zip": "pnpm build && rm -f NotCC.zip && cd artifacts && zip -r ../NotCC.zip .",
- "dev": "neu run",
- "prepublish": "neu update"
- },
- "dependencies": {
- "@neutralinojs/neu": "^9.8.0",
- "zx": "^7.2.3"
- }
-}
diff --git a/desktopPlayer/webDist b/desktopPlayer/webDist
deleted file mode 120000
index b2924b5a..00000000
--- a/desktopPlayer/webDist
+++ /dev/null
@@ -1 +0,0 @@
-../gamePlayer/dist
\ No newline at end of file
diff --git a/desktopPlayer/NotCC.app/Contents/Info.plist b/gamePlayer/NotCC.app/Contents/Info.plist
similarity index 93%
rename from desktopPlayer/NotCC.app/Contents/Info.plist
rename to gamePlayer/NotCC.app/Contents/Info.plist
index 3a6d43a8..47621c58 100644
--- a/desktopPlayer/NotCC.app/Contents/Info.plist
+++ b/gamePlayer/NotCC.app/Contents/Info.plist
@@ -13,11 +13,11 @@
CFBundleIdentifierclub.glander.notcc-playerCFBundleVersion
- 1.0
+ 0.0.200CFBundleGetInfoStringNotCC by G lander & co.CFBundleShortVersionString
- 1.0
+ 2.0CFBundleIconFileicon.icns
diff --git a/desktopPlayer/NotCC.app/Contents/Resources/icon.icns b/gamePlayer/NotCC.app/Contents/Resources/icon.icns
similarity index 100%
rename from desktopPlayer/NotCC.app/Contents/Resources/icon.icns
rename to gamePlayer/NotCC.app/Contents/Resources/icon.icns
diff --git a/gamePlayer/index.html b/gamePlayer/index.html
index 69da5e5f..200891ab 100644
--- a/gamePlayer/index.html
+++ b/gamePlayer/index.html
@@ -3,8 +3,7 @@
-
- NotCC
+
-
+
+
+
+ NotCC
-
-
-
-
+ Better than bold. You've achieved a higher score than what is on the
+ scoreboards! Report it and be part of Chips history!
+
+
+
+ Bold Confirm. You're the second person to achieve this score, thus{" "}
+ confirming the unconfirmed score.
+
+
+
+ Partial Confirm. You've achieved a score higher than the highest
+ confirmed score, but lower than the unconfirmed score, thus confirming
+ that the unconfirmed score is at least partially real.
+
+
+
Bold. Same as highest known/reported score for this level.
+
+
+ Better than public. This score is better than the score of the public
+ route, but is less than bold.
+
+
+
Public. This score matches the public route score.
+
+
Solved. This score is worse than the public route score.
+ )
+ }
+)
+
+function useErrorRethrow(err: Error | null | undefined) {
+ useEffect(() => {
+ if (err) throw err
+ }, [err])
+}
+
+export function SetsGrid() {
+ const localSetsChanged = useAtomValue(localSetsChangedAtom)
+ const localSetsRes = usePromise(
+ () => aiGather(findAllLocalSets()),
+ [localSetsChanged]
+ )
+ // Failing to load local sets is really bad, we probably messed something up, show an error message
+ useErrorRethrow(localSetsRes.state === "error" ? localSetsRes.error : null)
+
+ const setsPromise = useBBClubSetsPromise()
+ const bbClubSetsRes = usePromise(() => setsPromise, [setsPromise])
+ // On the other hand, failing to load bb.club stuff isn't a huge issue - we may be offline or bb.club might just happen to be down
+
+ const sets: ItemLevelSet[] = useMemo(() => {
+ const sets: ItemLevelSet[] = []
+ if (localSetsRes.state === "done") {
+ sets.push(...localSetsRes.value)
+ }
+ if (bbClubSetsRes.state === "done") {
+ for (const bbClubSet of bbClubSetsRes.value) {
+ const localSet = sets.find(
+ lSet => lSet.localBBClubSet?.id === bbClubSet.bbClubSet!.set.id
+ )
+ // If there's a local set that's supposed to auto-update with a bb.club set, just add more info to that local set
+ if (localSet) {
+ localSet.bbClubSet = bbClubSet.bbClubSet!
+ localSet.setKey = `bb.club-${bbClubSet.bbClubSet!.set.id}`
+ } else {
+ sets.push(bbClubSet)
+ }
+ }
+ }
+ return sets
+ }, [bbClubSetsRes.state, localSetsRes.state])
+
+ // If there are multiple sets with the same name, we should show the set idents for those sets
+ const setsToDisambiguate = useMemo(() => {
+ const setNames = new Set()
+ const duplicateSets = new Set()
+ for (const set of sets) {
+ if (setNames.has(set.setName)) {
+ duplicateSets.add(set.setName)
+ }
+ setNames.add(set.setName)
+ }
+ return duplicateSets
+ }, [sets])
+
+ const [query, setQuery] = useState("")
+ const [localFirst, setLocalFirst] = useState(true)
+ const [sortingMode, setSortingMode] = useState("newest")
+ const sortedSets = useMemo(
+ () =>
+ sortSets(sets, {
+ query,
+ mode: sortingMode,
+ localFirst,
+ reverseMode: false,
+ }),
+ [sets, query, sortingMode, localFirst]
+ )
+
+ const allDoneLoading =
+ bbClubSetsRes.state !== "working" && localSetsRes.state !== "working"
+ return (
+
+
+ setQuery(ev.currentTarget.value)}
+ />
+
+
+
+ {bbClubSetsRes.state === "error" && (
+
+
+
+ Failed to load bb.club sets{" "}
+
+ Failed to load bb.club sets due to the following error:
+
+ This may indicate that you're offline, bb.club is down, or that
+ there is a NotCC bug.
+
+
+
+
+
+ )}
+ {!allDoneLoading && (
+
+
+ Loading following set data:
+ {localSetsRes.state === "working" && local sets}
+ {bbClubSetsRes.state === "working" && bb.club sets}
+