From 56ff52ddebc69a5fe28bda96b20d839a56616e23 Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 05:10:09 +0000
Subject: [PATCH 1/9] Feat: mc26.3, License change, stonecutter & blahaj
update, etc
---
LICENSE | 356 ++++++++++++++++++++++-----------
LICENSES/AGPL-3.0-or-later.txt | 235 ++++++++++++++++++++++
LICENSES/Apache-2.0.txt | 73 +++++++
LICENSES/CC0-1.0.txt | 121 +++++++++++
LICENSES/MIT.txt | 21 --
README.md | 8 +-
REUSE.toml | 63 ++++++
build.gradle.kts | 9 +-
build.mojmap.gradle.kts | 59 ------
gradle.properties | 4 +-
settings.gradle.bak | 22 --
settings.gradle.kts | 7 +-
stonecutter.gradle.kts | 25 ++-
13 files changed, 762 insertions(+), 241 deletions(-)
create mode 100644 LICENSES/AGPL-3.0-or-later.txt
create mode 100644 LICENSES/Apache-2.0.txt
create mode 100644 LICENSES/CC0-1.0.txt
delete mode 100644 LICENSES/MIT.txt
create mode 100644 REUSE.toml
delete mode 100644 build.mojmap.gradle.kts
delete mode 100644 settings.gradle.bak
diff --git a/LICENSE b/LICENSE
index 1625c17..0c97efd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,121 +1,235 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
- LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
- REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
- PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
- THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
- HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
- i. the right to reproduce, adapt, distribute, perform, display,
- communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
- likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
- v. rights protecting the extraction, dissemination, use and reuse of data
- in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
- European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation
- thereof, including any amended or successor version of such
- directive); and
-vii. other similar, equivalent or corresponding rights throughout the
- world based on applicable law or treaty, and any national
- implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
- warranties of any kind concerning the Work, express, implied,
- statutory or otherwise, including without limitation warranties of
- title, merchantability, fitness for a particular purpose, non
- infringement, or the absence of latent or other defects, accuracy, or
- the present or absence of errors, whether or not discoverable, all to
- the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
- that may apply to the Work or any use thereof, including without
- limitation any person's Copyright and Related Rights in the Work.
- Further, Affirmer disclaims responsibility for obtaining any necessary
- consents, permissions or other rights required for any use of the
- Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to
- this CC0 or use of the Work.
\ No newline at end of file
+GNU AFFERO GENERAL PUBLIC LICENSE
+Version 3, 19 November 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 Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are 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.
+
+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.
+
+Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
+
+The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
+
+An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
+
+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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
+
+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 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 work with which it is combined will remain governed by version 3 of the GNU General Public License.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
+
+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 AGPL, see .
diff --git a/LICENSES/AGPL-3.0-or-later.txt b/LICENSES/AGPL-3.0-or-later.txt
new file mode 100644
index 0000000..0c97efd
--- /dev/null
+++ b/LICENSES/AGPL-3.0-or-later.txt
@@ -0,0 +1,235 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+Version 3, 19 November 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 Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are 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.
+
+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.
+
+Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
+
+A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
+
+The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
+
+An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
+
+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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
+
+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 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 work with which it is combined will remain governed by version 3 of the GNU General Public License.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
+
+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 AGPL, see .
diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt
new file mode 100644
index 0000000..137069b
--- /dev/null
+++ b/LICENSES/Apache-2.0.txt
@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+ (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt
new file mode 100644
index 0000000..0e259d4
--- /dev/null
+++ b/LICENSES/CC0-1.0.txt
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
deleted file mode 100644
index 7c1643d..0000000
--- a/LICENSES/MIT.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 axle.coffee
-
-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.
diff --git a/README.md b/README.md
index e4244b7..f5ee017 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
# CoffeeProxy
-CoffeeProxy is a simple HTTP/SOCKS5 proxy mod for Minecraft Fabric 1.21.10.
+CoffeeProxy is a simple HTTP/SOCKS5 proxy mod for Minecraft Fabric 1.21.4-26.3!
-I had this mod in 1.8.9 but I couldn't find a single mod that did this for 1.21.10, so 1 ai slop prompt later and it exists or wtv.
+I had this mod in 1.8.9 but I couldn't find a single mod that did this for 1.21.10, ~~so 1 ai slop prompt later and it exists or wtv.~~ nah, I human-made this a while later.
## Support/Whatever
@@ -14,6 +14,6 @@ If you use the mod Firmament on hypixel skyblock, it is suggested to use another
## License
-I am a catboy; therefore, everything is open source. Feel free to skid this 52 different times, I really don't care. If it breaks dm me on discord - @axle.coffee or open a github issue or fix it yourself and open a PR MY code is licensed under MIT
+I am a catboy; therefore, everything is open source. Feel free to skid this 52 different times, I really don't care. If it breaks dm me on discord - @axle.coffee or open a github issue or fix it yourself and open a PR MY code is licensed under AGPL-3.0-or-later
-If there is any code that can't be distributed under an MIT license, please message me on discord or open an issue or whatever.
+As of September 2026, I am slowly moving all my projects to AGPL-3.0-or-later - if I have used code from any projects that are incompatible with this license, contact me on discord, and I will gladly resolve this!!
\ No newline at end of file
diff --git a/REUSE.toml b/REUSE.toml
new file mode 100644
index 0000000..8987131
--- /dev/null
+++ b/REUSE.toml
@@ -0,0 +1,63 @@
+# SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+# SPDX-License-Identifier: CC0-1.0
+
+version = 1
+
+SPDX-PackageName = "CoffeeProxy"
+SPDX-PackageSupplier = "Axle Duggan (axlecoffee) "
+SPDX-PackageDownloadLocation = "https://github.com/axlecoffee/coffeeproxy"
+
+[[annotations]]
+path = ["**/*.java"]
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+SPDX-FileCopyrightText = "2026 Axle Duggan (axlecoffee) "
+
+[[annotations]]
+path = [
+ "**/*.gradle.kts",
+ "**/gradle.properties",
+ "**/gradle-wrapper.properties",
+ "**/fabric.mod.json",
+ "**/*.mixins.json",
+ "**/stonecutter.gradle.kts",
+]
+SPDX-License-Identifier = "CC0-1.0"
+SPDX-FileCopyrightText = "2026 Axle Duggan (axlecoffee) "
+
+[[annotations]]
+path = [
+ "gradlew",
+ "gradlew.bat",
+]
+SPDX-License-Identifier = "Apache-2.0"
+SPDX-FileCopyrightText = "Gradle, Inc."
+
+[[annotations]]
+path = "gradle/wrapper/gradle-wrapper.jar"
+SPDX-License-Identifier = "Apache-2.0"
+SPDX-FileCopyrightText = "Gradle, Inc."
+
+[[annotations]]
+path = [
+ ".gitattributes",
+ ".gitignore",
+ ".github/**",
+ "README.md",
+]
+SPDX-License-Identifier = "CC0-1.0"
+SPDX-FileCopyrightText = "2026 Axle Duggan (axlecoffee) "
+
+[[annotations]]
+path = "LICENSES/**"
+SPDX-License-Identifier = "CC0-1.0"
+SPDX-FileCopyrightText = "2026 Axle Duggan (axlecoffee) "
+
+[[annotations]]
+path = "src/main/resources/assets/**"
+SPDX-License-Identifier = "CC0-1.0"
+SPDX-FileCopyrightText = "2026 Axle Duggan (axlecoffee) "
+
+[[annotations]]
+path = "LICENSE"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+SPDX-FileCopyrightText = "2026 Axle Duggan (axlecoffee) "
diff --git a/build.gradle.kts b/build.gradle.kts
index ca6830f..61efdcf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
//
-// SPDX-License-Identifier: MIT
-
+// SPDX-License-Identifier: CC0-1.0
plugins {
id("coffee.axle.blahaj")
}
@@ -9,12 +8,6 @@ plugins {
blahaj {
config {}
setup {
- /*
- deps.add("implementation", "io.netty:netty-handler-proxy:4.1.118.Final")
- deps.add("include", "io.netty:netty-handler-proxy:4.1.118.Final")
- deps.add("implementation", "io.netty:netty-codec-socks:4.1.118.Final")
- deps.add("include", "io.netty:netty-codec-socks:4.1.118.Final")
- */
}
}
diff --git a/build.mojmap.gradle.kts b/build.mojmap.gradle.kts
deleted file mode 100644
index 70be44f..0000000
--- a/build.mojmap.gradle.kts
+++ /dev/null
@@ -1,59 +0,0 @@
-plugins {
- id("net.fabricmc.fabric-loom")
-}
-
-val modVersion: String by project
-val mavenGroup: String by project
-val archivesBaseName: String by project
-val loaderVersion: String by project
-val fabricApiVersion: String by project
-
-version = "${modVersion}+${stonecutter.current.version}"
-group = mavenGroup
-base { archivesName.set(archivesBaseName) }
-
-val javaTarget = JavaVersion.VERSION_25
-
-java {
- withSourcesJar()
- sourceCompatibility = javaTarget
- targetCompatibility = javaTarget
- toolchain.languageVersion.set(JavaLanguageVersion.of(25))
-}
-
-@Suppress("UnstableApiUsage")
-loom {
- mixin { useLegacyMixinAp = false }
-}
-
-dependencies {
- val mcDependency = findProperty("minecraftDependency")?.toString() ?: stonecutter.current.version
- minecraft("com.mojang:minecraft:${mcDependency}")
- implementation("net.fabricmc:fabric-loader:${loaderVersion}")
- implementation("net.fabricmc.fabric-api:fabric-api:${fabricApiVersion}")
- include(implementation("io.netty:netty-handler-proxy:4.1.118.Final")!!)
- include(implementation("io.netty:netty-codec-socks:4.1.118.Final")!!)
-}
-
-tasks.processResources {
- inputs.property("version", project.version)
- filesMatching("fabric.mod.json") {
- expand(mapOf("version" to inputs.properties["version"]))
- }
-}
-
-tasks.withType().configureEach {
- options.encoding = "UTF-8"
- options.release.set(javaTarget.majorVersion.toInt())
-}
-
-tasks.jar {
- from("LICENSE") { rename { "${it}_${archivesBaseName}" } }
-}
-
-tasks.register("buildAndCollect") {
- group = "build"
- from(tasks.named("jar"))
- into(rootProject.layout.buildDirectory.dir("libs/${modVersion}"))
- dependsOn("build")
-}
diff --git a/gradle.properties b/gradle.properties
index 06a6020..f2c8c24 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
#
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: CC0-1.0
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true
@@ -18,7 +18,7 @@ mod.namespace=coffeeproxy
mod.display_name=CoffeeProxy
mod.description=Allows you to connect to servers through a SOCKS5 or HTTPS proxy
mod.discord=
-mod.license=MIT
+mod.license=AGPL-3.0-or-later
mod.github=axlecoffee/coffeeproxy
client.user=
diff --git a/settings.gradle.bak b/settings.gradle.bak
deleted file mode 100644
index 7ce7546..0000000
--- a/settings.gradle.bak
+++ /dev/null
@@ -1,22 +0,0 @@
-pluginManagement {
- repositories {
- mavenCentral()
- gradlePluginPortal()
- maven { url = "https://maven.fabricmc.net/" }
- maven { url = "https://maven.kikugie.dev/snapshots" }
- maven { url = "https://maven.kikugie.dev/releases" }
- }
-}
-
-plugins {
- id 'dev.kikugie.stonecutter' version '0.9.1'
-}
-
-stonecutter {
- create(rootProject) {
- versions('1.21.4', '1.21.5', '1.21.8', '1.21.9', '1.21.10', '1.21.11', '26.1')
- vcsVersion = '1.21.10'
- }
-}
-
-rootProject.name = 'coffeeproxy'
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 06f620a..6027611 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
//
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: CC0-1.0
pluginManagement {
repositories {
@@ -22,8 +22,8 @@ plugins {
id("dev.architectury.loom") version "1.14.473" apply false
kotlin("jvm") version "2.3.10" apply false
kotlin("plugin.serialization") version "2.3.10" apply false
- id("coffee.axle.blahaj") version "3.2.2"
- id("dev.kikugie.stonecutter") version "0.9.1"
+ id("coffee.axle.blahaj") version "3.3.1"
+ id("dev.kikugie.stonecutter") version "0.9.8"
}
rootProject.name = settings.extra["mod.name"] as String
@@ -50,5 +50,6 @@ blahaj {
mc("1.21.11", "fabric")
mc("26.1.2", "fabric")
mc("26.2", "fabric")
+ mc("26.3", "fabric")
}
}
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
index c0b2de6..bfbf55f 100644
--- a/stonecutter.gradle.kts
+++ b/stonecutter.gradle.kts
@@ -1,6 +1,6 @@
// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
//
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: CC0-1.0
plugins {
id("dev.kikugie.stonecutter")
@@ -8,3 +8,26 @@ plugins {
}
stonecutter active "1.21.10-fabric" /* [SC] DO NOT EDIT */
+
+stonecutter parameters {
+ replacements {
+ string(current.parsed >= "1.21.8") {
+ replace("RenderType::guiTextured", "RenderPipelines.GUI_TEXTURED")
+ replace("net.minecraft.client.renderer.RenderType", "net.minecraft.client.renderer.RenderPipelines")
+ }
+ // keys are anchored to code context: bare "Identifier" would eat "SPDX-License-Identifier"
+ // and bare "System.currentTimeMillis()" collides with the version-independent calls in Proxy
+ string(current.parsed >= "1.21.11") {
+ replace("net.minecraft.resources.ResourceLocation", "net.minecraft.resources.Identifier")
+ replace("ResourceLocation sprite = ResourceLocation.withDefaultNamespace", "Identifier sprite = Identifier.withDefaultNamespace")
+ replace("Util.getMillis() - pingSentAt", "System.currentTimeMillis() - pingSentAt")
+ replace("pingSentAt = Util.getMillis()", "pingSentAt = System.currentTimeMillis()")
+ }
+ string(current.parsed >= "26") {
+ replace("GuiGraphics", "GuiGraphicsExtractor")
+ }
+ string(current.parsed >= "26.2") {
+ replace("Minecraft.getInstance().setScreen", "Minecraft.getInstance().gui.setScreen")
+ }
+ }
+}
From 72d44f824253ce5f30e0789f611337c21ddd51c0 Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 05:10:29 +0000
Subject: [PATCH 2/9] chore: reformat noise
---
versions/1.21.10-fabric/gradle.properties | 2 +-
versions/1.21.11-fabric/gradle.properties | 2 +-
versions/1.21.4-fabric/gradle.properties | 2 +-
versions/26.1.2-fabric/gradle.properties | 2 +-
versions/26.2-fabric/gradle.properties | 2 +-
versions/26.3-fabric/gradle.properties | 1 +
6 files changed, 6 insertions(+), 5 deletions(-)
create mode 100644 versions/26.3-fabric/gradle.properties
diff --git a/versions/1.21.10-fabric/gradle.properties b/versions/1.21.10-fabric/gradle.properties
index e846a8f..90ee7a2 100644
--- a/versions/1.21.10-fabric/gradle.properties
+++ b/versions/1.21.10-fabric/gradle.properties
@@ -1 +1 @@
-loom.platform=fabric
+loom.platform=fabric
\ No newline at end of file
diff --git a/versions/1.21.11-fabric/gradle.properties b/versions/1.21.11-fabric/gradle.properties
index e846a8f..90ee7a2 100644
--- a/versions/1.21.11-fabric/gradle.properties
+++ b/versions/1.21.11-fabric/gradle.properties
@@ -1 +1 @@
-loom.platform=fabric
+loom.platform=fabric
\ No newline at end of file
diff --git a/versions/1.21.4-fabric/gradle.properties b/versions/1.21.4-fabric/gradle.properties
index e846a8f..90ee7a2 100644
--- a/versions/1.21.4-fabric/gradle.properties
+++ b/versions/1.21.4-fabric/gradle.properties
@@ -1 +1 @@
-loom.platform=fabric
+loom.platform=fabric
\ No newline at end of file
diff --git a/versions/26.1.2-fabric/gradle.properties b/versions/26.1.2-fabric/gradle.properties
index e846a8f..90ee7a2 100644
--- a/versions/26.1.2-fabric/gradle.properties
+++ b/versions/26.1.2-fabric/gradle.properties
@@ -1 +1 @@
-loom.platform=fabric
+loom.platform=fabric
\ No newline at end of file
diff --git a/versions/26.2-fabric/gradle.properties b/versions/26.2-fabric/gradle.properties
index e846a8f..90ee7a2 100644
--- a/versions/26.2-fabric/gradle.properties
+++ b/versions/26.2-fabric/gradle.properties
@@ -1 +1 @@
-loom.platform=fabric
+loom.platform=fabric
\ No newline at end of file
diff --git a/versions/26.3-fabric/gradle.properties b/versions/26.3-fabric/gradle.properties
new file mode 100644
index 0000000..90ee7a2
--- /dev/null
+++ b/versions/26.3-fabric/gradle.properties
@@ -0,0 +1 @@
+loom.platform=fabric
\ No newline at end of file
From 49d803b4b0f7948da5b9ac77e68f4155b938f89d Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 05:10:47 +0000
Subject: [PATCH 3/9] update to Modrinth logo(??)
---
.../assets/coffeeproxy/CoffeeProxy_128.png | Bin 0 -> 3201 bytes
src/main/resources/assets/coffeeproxy/icon.png | Bin 3684 -> 0 bytes
src/main/resources/assets/coffeeproxy/logo.png | Bin 0 -> 3201 bytes
src/main/resources/fabric.mod.json | 4 ++--
4 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/assets/coffeeproxy/CoffeeProxy_128.png
delete mode 100644 src/main/resources/assets/coffeeproxy/icon.png
create mode 100644 src/main/resources/assets/coffeeproxy/logo.png
diff --git a/src/main/resources/assets/coffeeproxy/CoffeeProxy_128.png b/src/main/resources/assets/coffeeproxy/CoffeeProxy_128.png
new file mode 100644
index 0000000000000000000000000000000000000000..72c1b2323c2b85dda7eb34a2050d7f0b2191744f
GIT binary patch
literal 3201
zcmZ8jcQo8v*Ph>)xkj`hdc@Uo34$Ssh&IY#+z>$!@v6}~qf7Lj=)FaW-i;b{h#Ev6
zqKn>x=;Rysz3)HYUTdG{+2!ng);epSbwX8D6v%He-2#C?4%TDG>f+S=OG)zy7{
zeRp?v38&)W;nCC6d-dv-nwpw}gTvU^*xugWmoH!D=H`lvi&Iike*XN~*VotH-oC%T
z-`UxDa&nTBlVfjhKR7sOYirBR&8?}a85$aDXJ^;n-yaYVpsK3M!NIY;z3uGm?CgtNe+0&l!^3N9YjbmRzkT~=W@eU=
zkufnb!NS6VLZL7iOm}y;q@*Mb4UM(6wXw1B`}gmcmzRxGv
z-@bioZf>rxum9=Or=6Xh@87=*3JU7z=nM}JfBg6nfk3=|{kp8IY<+#5fq`LQU;vB7
zHZ(LuM@KI$Efp3PzIpS;#KeS^m9?_6vZkiy=;&x>X6DzgUs6(1U0q#2e*7338ah2a
zZES2DA0N-k${HCNdH($Q!oq@>n3%Aza8y)OM@Prz<|Y#plcJ&`FE8)>{5%?sj*X2a
zBO?Nysiq6pZi}M+Zk{qU5s+B^*Er2iN6?YYbxww-8J)}UZBY{J
zYW1O*r|Isy`Sgpc-K|v5)&`$H$eA9R4`nXCCT`y^P;BVtd2&h=sqQ5Kdx1Bn!f8!w
zOWY!{qQ?J)@TY=v=9l~(2%9}8w?OpQ3rTP|8EYQrt#h@I9Epae)`?^J@fBnAU8Q+@
zUaof(=Z^Pm2I&(%D_VF6&sI9&Ph4MPN^-MbMr*RYx&M#{pFK_S>%1f}}aO#F77H
z4T`-lgI7RG_YW%C-49bN0{!2#Ojpdb&N!zHTd^L>h;hiwob*S@KdwL=0XSMJCEUK@XZeC&0u=y7)cJ+
z!L{O}!PPxYkKXUJR15~{U->nMq+tx%?*fcr%x;nhUfxO!gP1^#Ta_jL<6}N5hUkWA
z3l<2CFgP&hrLtxw*WuC1XhPkg7P3w0uAosst;-04A^Mp=thGA$_PR$fRe@yI^3_?r
zSKY9y3HWxk?>#w)Ib7a4U-QWZ)lm3;cBGJoL^R02`tWioaW6hiL`ln~)%90=wgH3T
z(>{`>=Zrw{53NMW(mQ0Sc6TDYW|DW)_aENQ
zEXnC`cb>lm13}eCg`N3chzLt;84;B>`-&}%iQ0C1T*>3twywm|?ufOBPUx(<
zF+i?Ve#}g)dA%n)-%|Sv%ey4V3G0)Df*-i#lyiGqj_x^qxRW%+=2}j!wYnsexkND?
zGIzC2*@<*ppgS7nP;^QKtV<(_0HEU#4r$Z1&*36lhcf6jYw;jy1QTfJ!G|s;kgyJQ
z4|n-xMK9(rfgl_wWeAM@&Z&4p&-;U&%QH6&Ae|`im<%~-n^re)-1`I$GEL*ti}9N0
zX=DX6n9!|1h#&=SW1H6OV?(Kcp`9tr;w^2?H>Vh87#sryyoJ9=U8BEkJLfK=1OJow
zDp>c=Fd~2|0%UI}=CS_q5D9D&vl3fhg-Rih3-E(F@woh
z7I?c~kN<%)=<@%r>opR%FML$~6c*6d7@IMY)og6FaXs~PJhd(AQGa$a+X9`9#+#LD
z$mF_0vhYu*8WMPjr$X`x+tA4dB6=H7G%*5!hXYG9lGyJM?Xw-yZ~*77d)fm0FHjd39jcvs#fzEV1&pfwUF4(NQAT-#S6{<}yPDIMcl
zoX*J3-Cw36v{Tiaf@`atA}$gE!5oFl@w=x@h~V6AnSCfwD6klgGz#kIo*UehrIxj@
zDRZK0*qSQ$t}?^tf5jHU{BWK=S}eia#BusChkP1(_lVp6{#&+S>FBx4>6$6Qi9X)~$SrJ8ajO)EZl|IBjeVhls!R>wx67^+4@
z$6aB@IkHG0vl6}-vGZUc6ya!>qP$5N*uW*I@+Y^|$0$mllBcl2y6s=pV}I_YMwD^j
zbn|24f+QQmhgvgUT1Coa9!`NeR_4|Vx!cB#Rh%EujHOoXl7R=k=f!fU0ljU-TL5*n_9!#n-b6{SUBVD`Br_UI8?CRZD5Uyww)YeyhnFp$^KLJw9ina%DShyo*n
z1~?GmI1^v167Xy89ButS0aO
zEU~ci{q+_#_q2~fNsxkGoNatt_-}Mw);BYN9q1JCK_?24ZFMK*v-0C6^Rq8^b=hY>F#|xe_1L?
z4EQC_gy3e~?0_Ni16h>0-4Dx}ox>vh0YW?JKEC!ug`&|!hqVhQ&Sg&umV21-GR3pv
z?W)eg_2B7t1f%cZ#kTFFQ7j4EpgrU1zUr?z{eXveVQ9)?dab*EJ8Yf$WO}#sj53S%
zd`10~DDIS5erk7VdC9=Nm6acwZ>{&gmvGUW_&3zyIPcb%D0u(P7Y2<|kt>ri@cTcR
C0n?BG
literal 0
HcmV?d00001
diff --git a/src/main/resources/assets/coffeeproxy/icon.png b/src/main/resources/assets/coffeeproxy/icon.png
deleted file mode 100644
index 58a7aa6dd4843b5808a52f087a1b0fb0bb51394c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3684
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
diff --git a/src/main/resources/assets/coffeeproxy/logo.png b/src/main/resources/assets/coffeeproxy/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..72c1b2323c2b85dda7eb34a2050d7f0b2191744f
GIT binary patch
literal 3201
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
C0n?BG
literal 0
HcmV?d00001
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2e6e63b..8183a95 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -10,8 +10,8 @@
"contact": {
"sources": "https://github.com/axlecoffee/coffeeproxy"
},
- "license": "MIT",
- "icon": "assets/coffeeproxy/icon.png",
+ "license": "AGPL-3.0-or-later",
+ "icon": "assets/coffeeproxy/logo.png",
"environment": "*",
"entrypoints": {
"main": [
From 53910fbf43a21e950754f1dbf876554b1fd2c783 Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 05:11:18 +0000
Subject: [PATCH 4/9] Major CoffeeProxy rewrite + 26.3 code, credits to
EricBakreChef for the suggestions! makes this wayyy more usable and such
---
.../java/coffee/axle/proxy/Coffeeproxy.java | 18 +-
.../proxy/CoffeeproxyModMenuIntegration.java | 5 +-
src/main/java/coffee/axle/proxy/Config.java | 47 ++-
src/main/java/coffee/axle/proxy/GuiProxy.java | 159 ++++-----
.../java/coffee/axle/proxy/GuiProxyList.java | 326 ++++++++++++++++++
src/main/java/coffee/axle/proxy/Proxy.java | 72 +++-
src/main/java/coffee/axle/proxy/TestPing.java | 110 +++---
.../proxy/mixin/ClientConnectionInit.java | 34 +-
.../proxy/mixin/MultiplayerScreenOpen.java | 52 +--
.../assets/coffeeproxy/lang/en_us.json | 14 +-
10 files changed, 595 insertions(+), 242 deletions(-)
create mode 100644 src/main/java/coffee/axle/proxy/GuiProxyList.java
diff --git a/src/main/java/coffee/axle/proxy/Coffeeproxy.java b/src/main/java/coffee/axle/proxy/Coffeeproxy.java
index dad6b91..b29825e 100644
--- a/src/main/java/coffee/axle/proxy/Coffeeproxy.java
+++ b/src/main/java/coffee/axle/proxy/Coffeeproxy.java
@@ -1,21 +1,23 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy;
import net.fabricmc.api.ModInitializer;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
public class Coffeeproxy implements ModInitializer {
public static boolean proxyEnabled = false;
public static Proxy proxy = new Proxy();
- public static Proxy lastUsedProxy = new Proxy();
- public static Button proxyMenuButton;
- public static boolean suppressProxyMixin = false;
-
- public static String getLastUsedProxyIp() {
- return lastUsedProxy.ipPort.isEmpty() ? "none" : lastUsedProxy.getIp();
- }
@Override
public void onInitialize() {
Config.loadConfig();
+ Config.setActive(Config.activeName);
+ }
+
+ public static void openScreen(Screen screen) {
+ Minecraft.getInstance().setScreen(screen);
}
}
\ No newline at end of file
diff --git a/src/main/java/coffee/axle/proxy/CoffeeproxyModMenuIntegration.java b/src/main/java/coffee/axle/proxy/CoffeeproxyModMenuIntegration.java
index f36e053..ba0b863 100644
--- a/src/main/java/coffee/axle/proxy/CoffeeproxyModMenuIntegration.java
+++ b/src/main/java/coffee/axle/proxy/CoffeeproxyModMenuIntegration.java
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
@@ -6,6 +9,6 @@
public class CoffeeproxyModMenuIntegration implements ModMenuApi {
@Override
public ConfigScreenFactory getModConfigScreenFactory() {
- return GuiProxy::new;
+ return GuiProxyList::new;
}
}
diff --git a/src/main/java/coffee/axle/proxy/Config.java b/src/main/java/coffee/axle/proxy/Config.java
index 4cbffa6..ddab7fe 100644
--- a/src/main/java/coffee/axle/proxy/Config.java
+++ b/src/main/java/coffee/axle/proxy/Config.java
@@ -1,43 +1,45 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy;
import com.google.gson.*;
-import com.google.gson.reflect.TypeToken;
import net.minecraft.client.Minecraft;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
public class Config {
private static final String CONFIG_PATH = Minecraft.getInstance().gameDirectory
+ "/config/CoffeeProxy.json";
- public static HashMap accounts = new HashMap<>();
- public static String lastPlayerName = "";
+ public static LinkedHashMap proxies = new LinkedHashMap<>();
+ public static String activeName = "";
public static boolean showMultiplayerButton = true;
public static void loadConfig() {
File configFile = new File(CONFIG_PATH);
try {
if (!configFile.exists()) {
- if (!configFile.createNewFile()) {
- System.out.println("Error creating CoffeeProxy.json file");
- }
+ // assume that if the config file doenst exist its prob first launch/whatever so just ... recreate it... you little weasle
+ FileUtils.touch(configFile);
return;
}
String configString = FileUtils.readFileToString(configFile, "UTF-8");
if (!configString.isEmpty()) {
JsonObject configJson = JsonParser.parseString(configString).getAsJsonObject();
- Coffeeproxy.proxyEnabled = configJson.get("proxy-enabled").getAsBoolean();
JsonElement showBtn = configJson.get("show-multiplayer-button");
Config.showMultiplayerButton = showBtn == null || showBtn.getAsBoolean();
- Type type = new TypeToken>() {
- }.getType();
- accounts = new Gson().fromJson(configJson.get("accounts"), type);
- if (accounts == null) {
- accounts = new HashMap<>();
+ JsonElement active = configJson.get("active");
+ Config.activeName = active == null ? "" : active.getAsString();
+ proxies = new LinkedHashMap<>();
+ JsonElement entries = configJson.get("proxies");
+ if (entries != null) {
+ for (var entry : entries.getAsJsonObject().entrySet()) {
+ proxies.put(entry.getKey(), entry.getValue().getAsString());
+ }
}
}
} catch (Exception e) {
@@ -46,18 +48,25 @@ public static void loadConfig() {
}
}
- public static void setDefaultProxy(Proxy proxy) {
- accounts.put("", proxy);
+ public static void setActive(String name) {
+ activeName = name == null ? "" : name;
+ String entry = proxies.get(activeName);
+ if (entry == null) {
+ Coffeeproxy.proxy = new Proxy();
+ Coffeeproxy.proxyEnabled = false;
+ } else {
+ Coffeeproxy.proxy = Proxy.parse(entry);
+ Coffeeproxy.proxyEnabled = true;
+ }
}
public static void saveConfig() {
try {
- JsonElement accountsJsonObject = new Gson().toJsonTree(accounts);
JsonObject configJson = new JsonObject();
- configJson.addProperty("proxy-enabled", Coffeeproxy.proxyEnabled);
configJson.addProperty("show-multiplayer-button", showMultiplayerButton);
- configJson.add("accounts", accountsJsonObject);
+ configJson.addProperty("active", activeName);
Gson gsonPretty = new GsonBuilder().setPrettyPrinting().create();
+ configJson.add("proxies", gsonPretty.toJsonTree(proxies));
FileUtils.write(new File(CONFIG_PATH), gsonPretty.toJson(configJson), StandardCharsets.UTF_8);
} catch (IOException e) {
System.out.println("Error writing CoffeeProxy.json file");
diff --git a/src/main/java/coffee/axle/proxy/GuiProxy.java b/src/main/java/coffee/axle/proxy/GuiProxy.java
index fd59487..3080acf 100644
--- a/src/main/java/coffee/axle/proxy/GuiProxy.java
+++ b/src/main/java/coffee/axle/proxy/GuiProxy.java
@@ -1,36 +1,29 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy;
-import net.minecraft.client.Minecraft;
-//? if <26 {
import net.minecraft.client.gui.GuiGraphics;
-//?} else {
-/*import net.minecraft.client.gui.GuiGraphicsExtractor;
-*///?}
import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.Checkbox;
import net.minecraft.client.gui.components.EditBox;
//? if >=1.21.10 {
-import net.minecraft.client.input.InputWithModifiers;
import net.minecraft.client.input.KeyEvent;
//?}
import net.minecraft.network.chat.Component;
import net.minecraft.ChatFormatting;
-import net.fabricmc.loader.api.FabricLoader;
import org.apache.commons.lang3.StringUtils;
public class GuiProxy extends Screen {
private Proxy.ProxyType currentType = Proxy.ProxyType.SOCKS5;
+ private EditBox name;
private EditBox ipPort;
private EditBox username;
private EditBox password;
- private Checkbox enabledCheck;
- private Checkbox showMultiplayerCheck;
private final Screen parentScreen;
+ private final String editName;
private String msg = "";
@@ -41,9 +34,10 @@ public class GuiProxy extends Screen {
private static final String TEXT_PROXY = Component.translatable("ui.coffeeproxy.options.proxy").getString();
- public GuiProxy(Screen parentScreen) {
+ public GuiProxy(Screen parentScreen, String editName) {
super(Component.literal(TEXT_PROXY));
this.parentScreen = parentScreen;
+ this.editName = editName;
}
private static boolean isValidIpPort(String ipP) {
@@ -97,68 +91,66 @@ public boolean keyPressed(KeyEvent keyEvent) {
public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
super.render(guiGraphics, mouseX, mouseY, partialTicks);
//?} else {
- /*public void extractRenderState(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY, float partialTicks) {
+ /*public void extractRenderState(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
super.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
*///?}
- if (enabledCheck.selected() && !isValidIpPort(ipPort.getValue())) {
- //? if >=1.21.10 {
- enabledCheck.onPress((InputWithModifiers) new KeyEvent(0, 0, 0));
- //?} else {
- /*enabledCheck.onPress();
- *///?}
- }
-
//? if <26 {
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
+ guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.name").getString(),
positionX, positionY[1] - 10, 0xFFA0A0A0);
+ guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
+ positionX, positionY[2] - 10, 0xFFA0A0A0);
guiGraphics.drawCenteredString(this.font,
- Component.translatable("ui.coffeeproxy.options.auth").getString(), this.width / 2, positionY[3] + 8,
+ Component.translatable("ui.coffeeproxy.options.auth").getString(), this.width / 2, positionY[4] + 8,
0xFFFFFFFF);
guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.ipPort").getString(),
- positionX, positionY[2] - 10, 0xFFA0A0A0);
+ positionX, positionY[3] - 10, 0xFFA0A0A0);
+ this.name.render(guiGraphics, mouseX, mouseY, partialTicks);
this.ipPort.render(guiGraphics, mouseX, mouseY, partialTicks);
if (currentType == Proxy.ProxyType.SOCKS4) {
guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.auth.id").getString(),
- positionX, positionY[4] - 10, 0xFFA0A0A0);
+ positionX, positionY[5] - 10, 0xFFA0A0A0);
this.username.render(guiGraphics, mouseX, mouseY, partialTicks);
} else {
guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.auth.password").getString(),
- positionX, positionY[5] - 10, 0xFFA0A0A0);
+ positionX, positionY[6] - 10, 0xFFA0A0A0);
guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.auth.username").getString(),
- positionX, positionY[4] - 10, 0xFFA0A0A0);
+ positionX, positionY[5] - 10, 0xFFA0A0A0);
this.username.render(guiGraphics, mouseX, mouseY, partialTicks);
this.password.render(guiGraphics, mouseX, mouseY, partialTicks);
}
guiGraphics.drawCenteredString(this.font, !msg.isEmpty() ? msg : testPing.state, this.width / 2,
- positionY[6] + 5, 0xFFA0A0A0);
+ positionY[7] + 5, 0xFFA0A0A0);
//?} else {
- /*guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
+ /*guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.name").getString(),
positionX, positionY[1] - 10, 0xFFA0A0A0);
+ guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
+ positionX, positionY[2] - 10, 0xFFA0A0A0);
guiGraphics.centeredText(this.font,
- Component.translatable("ui.coffeeproxy.options.auth").getString(), this.width / 2, positionY[3] + 8,
+ Component.translatable("ui.coffeeproxy.options.auth").getString(), this.width / 2, positionY[4] + 8,
0xFFFFFFFF);
guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.ipPort").getString(),
- positionX, positionY[2] - 10, 0xFFA0A0A0);
+ positionX, positionY[3] - 10, 0xFFA0A0A0);
+ this.name.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
this.ipPort.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
if (currentType == Proxy.ProxyType.SOCKS4) {
guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.auth.id").getString(),
- positionX, positionY[4] - 10, 0xFFA0A0A0);
+ positionX, positionY[5] - 10, 0xFFA0A0A0);
this.username.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
} else {
guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.auth.password").getString(),
- positionX, positionY[5] - 10, 0xFFA0A0A0);
+ positionX, positionY[6] - 10, 0xFFA0A0A0);
guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.auth.username").getString(),
- positionX, positionY[4] - 10, 0xFFA0A0A0);
+ positionX, positionY[5] - 10, 0xFFA0A0A0);
this.username.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
this.password.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
}
guiGraphics.centeredText(this.font, !msg.isEmpty() ? msg : testPing.state, this.width / 2,
- positionY[6] + 5, 0xFFA0A0A0);
+ positionY[7] + 5, 0xFFA0A0A0);
*///?}
}
@@ -172,34 +164,44 @@ public void init() {
int buttonLength = 160;
centerButtons(11, buttonLength, 32);
- String savedIpPort = this.ipPort != null ? this.ipPort.getValue() : Coffeeproxy.proxy.ipPort;
- String savedUsername = this.username != null ? this.username.getValue() : Coffeeproxy.proxy.username;
- String savedPassword = this.password != null ? this.password.getValue() : Coffeeproxy.proxy.password;
+ String entry = editName == null ? "" : Config.proxies.getOrDefault(editName, "");
+ Proxy saved = entry.isEmpty() ? new Proxy() : Proxy.parse(entry);
+
+ String savedName = this.name != null ? this.name.getValue() : (editName == null ? "" : editName);
+ String savedIpPort = this.ipPort != null ? this.ipPort.getValue() : saved.ipPort;
+ String savedUsername = this.username != null ? this.username.getValue() : saved.username;
+ String savedPassword = this.password != null ? this.password.getValue() : saved.password;
if (this.ipPort == null) {
- currentType = Coffeeproxy.proxy.type;
+ currentType = saved.type;
}
+ this.name = new EditBox(this.font, positionX, positionY[1], buttonLength, 20,
+ Component.literal(""));
+ this.name.setValue(savedName);
+ this.name.setMaxLength(64);
+ this.name.setFocused(true);
+ this.addWidget(this.name);
+
Button proxyType = Button.builder(Component.literal(currentType.name()), button -> {
Proxy.ProxyType[] values = Proxy.ProxyType.values();
currentType = values[(currentType.ordinal() + 1) % values.length];
button.setMessage(Component.literal(currentType.name()));
- }).bounds(positionX, positionY[1], buttonLength, 20).build();
+ }).bounds(positionX, positionY[2], buttonLength, 20).build();
this.addRenderableWidget(proxyType);
- this.ipPort = new EditBox(this.font, positionX, positionY[2], buttonLength, 20,
+ this.ipPort = new EditBox(this.font, positionX, positionY[3], buttonLength, 20,
Component.literal(""));
this.ipPort.setValue(savedIpPort);
this.ipPort.setMaxLength(1024);
- this.ipPort.setFocused(true);
this.addWidget(this.ipPort);
- this.username = new EditBox(this.font, positionX, positionY[4], buttonLength, 20,
+ this.username = new EditBox(this.font, positionX, positionY[5], buttonLength, 20,
Component.literal(""));
this.username.setMaxLength(255);
this.username.setValue(savedUsername);
this.addWidget(this.username);
- this.password = new EditBox(this.font, positionX, positionY[5], buttonLength, 20,
+ this.password = new EditBox(this.font, positionX, positionY[6], buttonLength, 20,
Component.literal(""));
this.password.setMaxLength(255);
this.password.setValue(savedPassword);
@@ -207,23 +209,29 @@ public void init() {
int posXButtons = (this.width / 2) - (((buttonLength / 2) * 3) / 2);
- Button apply = Button.builder(Component.translatable("ui.coffeeproxy.options.apply"), button -> {
- Config.showMultiplayerButton = showMultiplayerCheck.selected();
- if (!ipPort.getValue().isEmpty() && !checkProxy()) {
- Config.saveConfig();
+ Button apply = Button.builder(Component.translatable("ui.coffeeproxy.options.save"), button -> {
+ String entryName = name.getValue().trim();
+ if (entryName.isEmpty()) {
+ msg = ChatFormatting.RED + Component.translatable("ui.coffeeproxy.err.specName").getString();
+ this.name.setFocused(true);
return;
}
- if (!ipPort.getValue().isEmpty()) {
- Coffeeproxy.proxy = new Proxy(currentType, ipPort.getValue(), username.getValue(), password.getValue());
- Coffeeproxy.proxyEnabled = enabledCheck.selected();
- Config.setDefaultProxy(Coffeeproxy.proxy);
+ if (!checkProxy()) {
+ return;
+ }
+ Proxy edited = new Proxy(currentType, ipPort.getValue(), username.getValue(), password.getValue());
+ if (editName != null && !editName.equals(entryName)) {
+ Config.proxies.remove(editName);
+ if (Config.activeName.equals(editName)) {
+ Config.activeName = entryName;
+ }
+ }
+ Config.proxies.put(entryName, edited.format());
+ if (entryName.equals(Config.activeName)) {
+ Config.setActive(entryName);
}
Config.saveConfig();
- //? if <26.2 {
- Minecraft.getInstance().setScreen(new JoinMultiplayerScreen(new TitleScreen()));
- //?} else {
- /*Minecraft.getInstance().gui.setScreen(new JoinMultiplayerScreen(new TitleScreen()));
- *///?}
+ Coffeeproxy.openScreen(parentScreen);
}).bounds(posXButtons, positionY[9], buttonLength / 2 - 3, 20).build();
this.addRenderableWidget(apply);
@@ -234,45 +242,14 @@ public void init() {
}
if (checkProxy()) {
testPing = new TestPing();
- testPing.run("mc.hypixel.net", 25565,
+ testPing.run("anticheat-test.com", 25565,
new Proxy(currentType, ipPort.getValue(), username.getValue(), password.getValue()));
}
}).bounds(posXButtons + buttonLength / 2 + 3, positionY[9], buttonLength / 2 - 3, 20).build();
this.addRenderableWidget(test);
- Checkbox.Builder checkboxBuilder = Checkbox
- .builder(Component.translatable("ui.coffeeproxy.options.proxyEnabled"), this.font);
- checkboxBuilder.pos(
- (this.width / 2)
- - (15 + font.width(Component.translatable("ui.coffeeproxy.options.proxyEnabled"))) / 2,
- positionY[7]);
- boolean shouldBeChecked = this.enabledCheck != null ? this.enabledCheck.selected() : Coffeeproxy.proxyEnabled;
- if (shouldBeChecked) {
- checkboxBuilder.selected(true);
- }
- this.enabledCheck = checkboxBuilder.build();
- this.addRenderableWidget(this.enabledCheck);
-
- Checkbox.Builder showMultiplayerBuilder = Checkbox
- .builder(Component.translatable("ui.coffeeproxy.options.showMultiplayerButton"), this.font);
- showMultiplayerBuilder.pos(
- (this.width / 2)
- - (15 + font.width(Component.translatable("ui.coffeeproxy.options.showMultiplayerButton"))) / 2,
- positionY[8]);
- boolean shouldShowMultiplayer = this.showMultiplayerCheck != null ? this.showMultiplayerCheck.selected() : Config.showMultiplayerButton;
- if (shouldShowMultiplayer) {
- showMultiplayerBuilder.selected(true);
- }
- this.showMultiplayerCheck = showMultiplayerBuilder.build();
- this.showMultiplayerCheck.active = FabricLoader.getInstance().isModLoaded("modmenu");
- this.addRenderableWidget(this.showMultiplayerCheck);
-
Button cancel = Button.builder(Component.translatable("ui.coffeeproxy.options.cancel"), (button) -> {
- //? if <26.2 {
- Minecraft.getInstance().setScreen(parentScreen);
- //?} else {
- /*Minecraft.getInstance().gui.setScreen(parentScreen);
- *///?}
+ Coffeeproxy.openScreen(parentScreen);
}).bounds(posXButtons + (buttonLength / 2 + 3) * 2, positionY[9], buttonLength / 2 - 3, 20).build();
this.addRenderableWidget(cancel);
}
diff --git a/src/main/java/coffee/axle/proxy/GuiProxyList.java b/src/main/java/coffee/axle/proxy/GuiProxyList.java
new file mode 100644
index 0000000..bd1e178
--- /dev/null
+++ b/src/main/java/coffee/axle/proxy/GuiProxyList.java
@@ -0,0 +1,326 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+package coffee.axle.proxy;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Checkbox;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+//? if >=1.21.10 {
+import net.minecraft.client.input.MouseButtonEvent;
+//?} else {
+/*import net.minecraft.Util;
+*///?}
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.client.renderer.RenderPipelines;
+import net.fabricmc.loader.api.FabricLoader;
+
+public class GuiProxyList extends Screen {
+ private final Screen parentScreen;
+
+ private ProxyList proxyList;
+ private Button connectButton;
+ private Button deleteButton;
+ private Button editButton;
+ private Checkbox showMultiplayerCheck;
+
+ private static final String TEXT_TITLE = Component.translatable("ui.coffeeproxy.list.title").getString();
+ private static final String TEXT_FAILED = Component.translatable("ui.coffeeproxy.list.failed").getString();
+ private static final Component TEXT_CONNECT = Component.translatable("ui.coffeeproxy.list.connect");
+ private static final Component TEXT_DISCONNECT = Component.translatable("ui.coffeeproxy.list.disconnect");
+
+ public GuiProxyList(Screen parentScreen) {
+ super(Component.literal(TEXT_TITLE));
+ this.parentScreen = parentScreen;
+ }
+
+ @Override
+ public void init() {
+ this.proxyList = new ProxyList(this.minecraft);
+ this.addRenderableWidget(this.proxyList);
+ for (var entry : Config.proxies.entrySet()) {
+ this.proxyList.addProxy(entry.getKey(), entry.getValue());
+ }
+
+ int x1 = this.width / 2 - 154;
+ int x2 = x1 + 104;
+ int x3 = x1 + 208;
+
+ this.connectButton = this.addRenderableWidget(Button
+ .builder(TEXT_CONNECT, button -> connectSelected())
+ .bounds(x1, this.height - 52, 100, 20).build());
+ this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.list.add"), button -> openEditor(null))
+ .bounds(x2, this.height - 52, 100, 20).build());
+ this.editButton = this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.list.edit"), button -> {
+ ProxyEntry selected = this.proxyList.getSelected();
+ if (selected != null) {
+ openEditor(selected.name);
+ }
+ })
+ .bounds(x3, this.height - 52, 100, 20).build());
+
+ this.deleteButton = this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.list.delete"), button -> deleteSelected())
+ .bounds(x1, this.height - 28, 100, 20).build());
+ this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.list.refresh"), button -> this.proxyList.refreshPings())
+ .bounds(x2, this.height - 28, 100, 20).build());
+ this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.list.done"), button -> onClose())
+ .bounds(x3, this.height - 28, 100, 20).build());
+
+ Checkbox.Builder showMultiplayerBuilder = Checkbox
+ .builder(Component.translatable("ui.coffeeproxy.options.showMultiplayerButton"), this.font);
+ showMultiplayerBuilder.pos(0, this.height - 78);
+ showMultiplayerBuilder.selected(Config.showMultiplayerButton);
+ this.showMultiplayerCheck = showMultiplayerBuilder.build();
+ this.showMultiplayerCheck.setX(this.width / 2 - this.showMultiplayerCheck.getWidth() / 2);
+ this.showMultiplayerCheck.active = FabricLoader.getInstance().isModLoaded("modmenu");
+ this.addRenderableWidget(this.showMultiplayerCheck);
+ }
+
+ private void connectSelected() {
+ ProxyEntry selected = this.proxyList.getSelected();
+ if (selected != null) {
+ connectTo(selected.name);
+ }
+ }
+
+ void connectTo(String name) {
+ Config.setActive(Config.activeName.equals(name) ? "" : name);
+ Config.saveConfig();
+ ProxyEntry selected = this.proxyList.getSelected();
+ if (selected != null) {
+ selected.startPing();
+ }
+ }
+
+ void openEditor(String editName) {
+ Coffeeproxy.openScreen(new GuiProxy(this, editName));
+ }
+
+ private void deleteSelected() {
+ ProxyEntry selected = this.proxyList.getSelected();
+ if (selected == null) {
+ return;
+ }
+ Config.proxies.remove(selected.name);
+ if (Config.activeName.equals(selected.name)) {
+ Config.setActive("");
+ }
+ Config.saveConfig();
+ this.proxyList.removeSelected(selected);
+ this.proxyList.setSelected(null);
+ }
+
+ @Override
+ public void tick() {
+ this.proxyList.tickEntries();
+ }
+
+ @Override
+ //? if <26 {
+ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+ super.render(guiGraphics, mouseX, mouseY, partialTicks);
+ //?} else {
+ /*public void extractRenderState(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+ super.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
+ *///?}
+ ProxyEntry selected = this.proxyList.getSelected();
+ this.connectButton.active = selected != null;
+ this.connectButton.setMessage(selected != null && selected.name.equals(Config.activeName)
+ ? TEXT_DISCONNECT : TEXT_CONNECT);
+ this.deleteButton.active = selected != null;
+ this.editButton.active = selected != null;
+
+ //? if <26 {
+ guiGraphics.drawCenteredString(this.font, TEXT_TITLE, this.width / 2, 8, 0xFFFFFFFF);
+ //?} else {
+ /*guiGraphics.centeredText(this.font, TEXT_TITLE, this.width / 2, 8, 0xFFFFFFFF);
+ *///?}
+ }
+
+ @Override
+ public void onClose() {
+ Config.showMultiplayerButton = this.showMultiplayerCheck.selected();
+ Config.saveConfig();
+ Coffeeproxy.openScreen(this.parentScreen);
+ }
+
+ private class ProxyList extends ObjectSelectionList {
+ ProxyList(Minecraft minecraft) {
+ super(minecraft, GuiProxyList.this.width, GuiProxyList.this.height - 116, 28, 36);
+ }
+
+ @Override
+ public int getRowWidth() {
+ return 305;
+ }
+
+ void addProxy(String name, String entry) {
+ this.addEntry(new ProxyEntry(name, entry));
+ }
+
+ void removeSelected(ProxyEntry row) {
+ this.removeEntry(row);
+ }
+
+ void refreshPings() {
+ for (ProxyEntry row : this.children()) {
+ row.startPing();
+ }
+ }
+
+ void tickEntries() {
+ for (ProxyEntry row : this.children()) {
+ row.tickPing();
+ }
+ }
+ }
+
+ private class ProxyEntry extends ObjectSelectionList.Entry {
+ final String name;
+ final Proxy proxy;
+ private TestPing testPing = new TestPing();
+ private long lastClickTime;
+ private int rowLeft;
+ private int rowTop;
+ private int rowWidth;
+
+ ProxyEntry(String name, String endpoint) {
+ this.name = name;
+ this.proxy = Proxy.parse(endpoint);
+ startPing();
+ }
+
+ void startPing() {
+ this.testPing = new TestPing();
+ this.testPing.run("anticheat-test.com", 25565, this.proxy);
+ }
+
+ void tickPing() {
+ this.testPing.pingPendingNetworks();
+ }
+
+ @Override
+ public Component getNarration() {
+ return Component.literal(this.name);
+ }
+
+ private int rowColor() {
+ if (this.testPing.failed) {
+ return 0xFFFF5555;
+ }
+ if (this.name.equals(Config.activeName)) {
+ return 0xFF55FF55;
+ }
+ return 0xFFA0A0A0;
+ }
+
+ private String pingText() {
+ if (this.testPing.failed) {
+ return TEXT_FAILED;
+ }
+ if (this.testPing.latency >= 0) {
+ return Component.translatable("multiplayer.status.ping", this.testPing.latency).getString();
+ }
+ return "";
+ }
+
+ // vanilla ServerSelectionList bands: <=150 full bars, then 300/600/1000
+ private String pingSprite() {
+ long l = this.testPing.latency;
+ if (l < 0) {
+ return "unreachable";
+ }
+ if (l <= 150) return "ping_5";
+ if (l <= 300) return "ping_4";
+ if (l <= 600) return "ping_3";
+ if (l <= 1000) return "ping_2";
+ return "ping_1";
+ }
+
+ private boolean clickRow(boolean doubleClick) {
+ proxyList.setSelected(this);
+ if (doubleClick) {
+ connectTo(this.name);
+ }
+ return true;
+ }
+
+ //? if <1.21.10 {
+ /*@Override
+ public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX,
+ int mouseY, boolean hovering, float partialTicks) {
+ this.rowLeft = left;
+ this.rowTop = top;
+ this.rowWidth = width;
+ drawRow(guiGraphics);
+ }
+
+ @Override
+ public boolean mouseClicked(double mouseX, double mouseY, int button) {
+ boolean doubleClick = Util.getMillis() - this.lastClickTime < 250;
+ this.lastClickTime = Util.getMillis();
+ return clickRow(doubleClick);
+ }
+ *///?}
+ //? if >=1.21.10 <26 {
+ @Override
+ public void renderContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovering, float partialTicks) {
+ this.rowLeft = this.getX();
+ this.rowTop = this.getY();
+ this.rowWidth = this.getWidth();
+ drawRow(guiGraphics);
+ }
+ //?}
+ //? if >=26 {
+ /*@Override
+ public void extractContent(GuiGraphics guiGraphics, int mouseX, int mouseY, boolean hovering,
+ float partialTicks) {
+ this.rowLeft = this.getX();
+ this.rowTop = this.getY();
+ this.rowWidth = this.getWidth();
+ drawRow(guiGraphics);
+ }
+ *///?}
+ //? if >=1.21.10 {
+ @Override
+ public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
+ return clickRow(doubleClick);
+ }
+ //?}
+
+ //? if <26 {
+ private void drawRow(GuiGraphics guiGraphics) {
+ int color = rowColor();
+ String ping = pingText();
+ guiGraphics.drawString(GuiProxyList.this.font, this.name, this.rowLeft + 2, this.rowTop + 2, color);
+ guiGraphics.drawString(GuiProxyList.this.font, this.proxy.ipPort, this.rowLeft + 2, this.rowTop + 13, 0xFF808080);
+ int iconX = this.rowLeft + this.rowWidth - 14;
+ ResourceLocation sprite = ResourceLocation.withDefaultNamespace("server_list/" + pingSprite());
+ guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, sprite,
+ iconX, this.rowTop + 2, 10, 8);
+ guiGraphics.drawString(GuiProxyList.this.font, ping, iconX - 2 - GuiProxyList.this.font.width(ping), this.rowTop + 2, color);
+ }
+ //?} else {
+ /*private void drawRow(GuiGraphics guiGraphics) {
+ int color = rowColor();
+ String ping = pingText();
+ guiGraphics.text(GuiProxyList.this.font, this.name, this.rowLeft + 2, this.rowTop + 2, color);
+ guiGraphics.text(GuiProxyList.this.font, this.proxy.ipPort, this.rowLeft + 2, this.rowTop + 13, 0xFF808080);
+ int iconX = this.rowLeft + this.rowWidth - 14;
+ ResourceLocation sprite = ResourceLocation.withDefaultNamespace("server_list/" + pingSprite());
+ guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, sprite,
+ iconX, this.rowTop + 2, 10, 8);
+ guiGraphics.text(GuiProxyList.this.font, ping, iconX - 2 - GuiProxyList.this.font.width(ping), this.rowTop + 2, color);
+ }
+ *///?}
+ }
+}
diff --git a/src/main/java/coffee/axle/proxy/Proxy.java b/src/main/java/coffee/axle/proxy/Proxy.java
index 2e0006f..45e66dc 100644
--- a/src/main/java/coffee/axle/proxy/Proxy.java
+++ b/src/main/java/coffee/axle/proxy/Proxy.java
@@ -1,6 +1,12 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy;
-import com.google.gson.annotations.SerializedName;
+import io.netty.handler.proxy.HttpProxyHandler;
+import io.netty.handler.proxy.ProxyHandler;
+import io.netty.handler.proxy.Socks4ProxyHandler;
+import io.netty.handler.proxy.Socks5ProxyHandler;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -11,7 +17,6 @@ public class Proxy {
private static final ConcurrentHashMap DNS_CACHE = new ConcurrentHashMap<>();
private static final long DNS_CACHE_TTL_MS = 5 * 60 * 1000L;
- @SerializedName("IP:PORT")
public String ipPort = "";
public ProxyType type = ProxyType.SOCKS5;
public String username = "";
@@ -23,10 +28,6 @@ public class Proxy {
public Proxy() {
}
- public Proxy(boolean isSocks4, String ipPort, String username, String password) {
- this(isSocks4 ? ProxyType.SOCKS4 : ProxyType.SOCKS5, ipPort, username, password);
- }
-
public Proxy(ProxyType type, String ipPort, String username, String password) {
this.type = type;
this.ipPort = ipPort;
@@ -34,6 +35,52 @@ public Proxy(ProxyType type, String ipPort, String username, String password) {
this.password = password;
}
+ public static Proxy parse(String entry) {
+ Proxy proxy = new Proxy();
+ String rest = entry.trim();
+ int schemeEnd = rest.indexOf("://");
+ if (schemeEnd >= 0) {
+ String scheme = rest.substring(0, schemeEnd);
+ if (scheme.equalsIgnoreCase("socks4")) {
+ proxy.type = ProxyType.SOCKS4;
+ } else if (scheme.equalsIgnoreCase("http")) {
+ proxy.type = ProxyType.HTTP;
+ }
+ rest = rest.substring(schemeEnd + 3).trim();
+ }
+ int at = rest.indexOf('@');
+ if (at >= 0) {
+ String auth = rest.substring(at + 1);
+ rest = rest.substring(0, at);
+ int colon = auth.indexOf(':');
+ if (colon >= 0) {
+ proxy.username = auth.substring(0, colon);
+ proxy.password = auth.substring(colon + 1);
+ } else {
+ proxy.username = auth;
+ }
+ }
+ proxy.ipPort = rest;
+ return proxy;
+ }
+
+ public String format() {
+ String scheme = "";
+ if (type == ProxyType.SOCKS4) {
+ scheme = "socks4://";
+ } else if (type == ProxyType.HTTP) {
+ scheme = "http://";
+ }
+ String auth = "";
+ if (!username.isEmpty()) {
+ auth = "@" + username;
+ if (!password.isEmpty()) {
+ auth += ":" + password;
+ }
+ }
+ return scheme + ipPort + auth;
+ }
+
public int getPort() {
return Integer.parseInt(ipPort.split(":")[1]);
}
@@ -52,6 +99,19 @@ public InetSocketAddress resolveProxyAddress() {
return cachedAddress;
}
+ public ProxyHandler getHandler() {
+ return switch (type) {
+ case SOCKS5 -> new Socks5ProxyHandler(resolveProxyAddress(),
+ username.isEmpty() ? null : username,
+ password.isEmpty() ? null : password);
+ case SOCKS4 -> new Socks4ProxyHandler(resolveProxyAddress(),
+ username.isEmpty() ? null : username);
+ case HTTP -> new HttpProxyHandler(resolveProxyAddress(),
+ username.isEmpty() ? null : username,
+ password.isEmpty() ? "" : password);
+ };
+ }
+
public static InetAddress resolveAddress(String host) throws UnknownHostException {
CachedResolve cached = DNS_CACHE.get(host);
long now = System.currentTimeMillis();
diff --git a/src/main/java/coffee/axle/proxy/TestPing.java b/src/main/java/coffee/axle/proxy/TestPing.java
index 9a98b89..4fc2d9c 100644
--- a/src/main/java/coffee/axle/proxy/TestPing.java
+++ b/src/main/java/coffee/axle/proxy/TestPing.java
@@ -1,11 +1,12 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.proxy.Socks4ProxyHandler;
-import io.netty.handler.proxy.Socks5ProxyHandler;
import io.netty.handler.timeout.ReadTimeoutHandler;
import net.minecraft.network.Connection;
import net.minecraft.network.ConnectionProtocol;
@@ -16,7 +17,6 @@
import net.minecraft.network.protocol.status.ClientStatusPacketListener;
import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
import net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
-import net.minecraft.network.protocol.status.StatusProtocols;
import net.minecraft.network.chat.Component;
import net.minecraft.ChatFormatting;
//? if <1.21.11 {
@@ -30,6 +30,8 @@
public class TestPing {
public String state = "";
+ public long latency = -1;
+ public boolean failed = false;
private long pingSentAt;
private Connection pingDestination = null;
@@ -39,6 +41,8 @@ public class TestPing {
public void run(String ip, int port, Proxy proxy) {
this.proxy = proxy;
+ this.latency = -1;
+ this.failed = false;
TestPing.EXECUTOR.submit(() -> ping(ip, port));
}
@@ -48,37 +52,32 @@ private void ping(String ip, int port) {
try {
connection = createTestConnection(Proxy.resolveAddress(ip), port);
} catch (UnknownHostException e) {
+ failed = true;
state = ChatFormatting.RED + Component.translatable("ui.coffeeproxy.err.cantConnect").getString();
return;
} catch (Exception e) {
+ failed = true;
state = ChatFormatting.RED + Component.translatable("ui.coffeeproxy.err.cantPing", ip).getString();
return;
}
pingDestination = connection;
- connection.setupInboundProtocol(StatusProtocols.CLIENTBOUND, new ClientStatusPacketListener() {
+ connection.initiateServerboundStatusConnection(ip, port, new ClientStatusPacketListener() {
private boolean successful;
@Override
public void handlePongResponse(ClientboundPongResponsePacket packet) {
successful = true;
pingDestination = null;
- //? if <1.21.11 {
long pingToServer = Util.getMillis() - pingSentAt;
- //?} else {
- /*long pingToServer = System.currentTimeMillis() - pingSentAt;
- *///?}
+ latency = pingToServer;
state = Component.translatable("ui.coffeeproxy.ping.showPing", pingToServer).getString();
connection.disconnect(Component.translatable("multiplayer.status.finished"));
}
@Override
public void handleStatusResponse(ClientboundStatusResponsePacket packet) {
- //? if <1.21.11 {
pingSentAt = Util.getMillis();
- //?} else {
- /*pingSentAt = System.currentTimeMillis();
- *///?}
connection.send(new ServerboundPingRequestPacket(pingSentAt));
}
@@ -86,6 +85,7 @@ public void handleStatusResponse(ClientboundStatusResponsePacket packet) {
public void onDisconnect(DisconnectionDetails details) {
pingDestination = null;
if (!this.successful) {
+ failed = true;
state = ChatFormatting.RED
+ Component.translatable("ui.coffeeproxy.err.cantPingReason", ip, details.reason().getString())
.getString();
@@ -103,64 +103,46 @@ public ConnectionProtocol protocol() {
}
});
- try {
- connection.send(ServerboundStatusRequestPacket.INSTANCE);
- } catch (Throwable throwable) {
- state = ChatFormatting.RED + Component.translatable("ui.coffeeproxy.err.cantPing", ip).getString();
- }
+ // vanilla sends this right after initiate (it only sets up protocols + handshake)
+ connection.send(ServerboundStatusRequestPacket.INSTANCE);
}
private Connection createTestConnection(InetAddress address, int port) {
final Connection connection = new Connection(PacketFlow.CLIENTBOUND);
- Coffeeproxy.suppressProxyMixin = true;
- try {
- //? if <1.21.11 {
- new Bootstrap()
- .group(Connection.NETWORK_WORKER_GROUP.get())
- //?} else {
- /*var eventLoopHolder = net.minecraft.server.network.EventLoopGroupHolder.remote(false);
- new Bootstrap()
- .group(eventLoopHolder.eventLoopGroup())
- *///?}
- .handler(new ChannelInitializer() {
- @Override
- protected void initChannel(Channel channel) {
- try {
- channel.config().setOption(ChannelOption.TCP_NODELAY, true);
- } catch (ChannelException ignored) {
- }
-
- ChannelPipeline pipeline = channel.pipeline().addLast("timeout",
- new ReadTimeoutHandler(30));
- Connection.configureSerialization(pipeline, PacketFlow.CLIENTBOUND, false, null);
- connection.configurePacketHandler(pipeline);
-
- switch (proxy.type) {
- case SOCKS5 -> channel.pipeline().addFirst(new Socks5ProxyHandler(
- proxy.resolveProxyAddress(),
- proxy.username.isEmpty() ? null : proxy.username,
- proxy.password.isEmpty() ? null : proxy.password));
- case SOCKS4 -> channel.pipeline().addFirst(new Socks4ProxyHandler(
- proxy.resolveProxyAddress(),
- proxy.username.isEmpty() ? null : proxy.username));
- case HTTP -> channel.pipeline().addFirst(new io.netty.handler.proxy.HttpProxyHandler(
- proxy.resolveProxyAddress(),
- proxy.username.isEmpty() ? null : proxy.username,
- proxy.password.isEmpty() ? "" : proxy.password));
- }
+ //? if <1.21.11 {
+ new Bootstrap()
+ .group(Connection.NETWORK_WORKER_GROUP.get())
+ //?} else {
+ /*var eventLoopHolder = net.minecraft.server.network.EventLoopGroupHolder.remote(false);
+ new Bootstrap()
+ .group(eventLoopHolder.eventLoopGroup())
+ *///?}
+ .handler(new ChannelInitializer() {
+ @Override
+ protected void initChannel(Channel channel) {
+ try {
+ channel.config().setOption(ChannelOption.TCP_NODELAY, true);
+ } catch (ChannelException ignored) {
}
- })
- //? if <1.21.11 {
- .channel(NioSocketChannel.class)
- //?} else {
- /*.channel(eventLoopHolder.channelCls())
- *///?}
- .connect(address, port)
- .syncUninterruptibly();
- } finally {
- Coffeeproxy.suppressProxyMixin = false;
- }
+
+ ChannelPipeline pipeline = channel.pipeline().addLast("timeout",
+ new ReadTimeoutHandler(30));
+
+ // added before configureSerialization so the mixin sees it and skips this channel
+ pipeline.addFirst(proxy.getHandler());
+
+ Connection.configureSerialization(pipeline, PacketFlow.CLIENTBOUND, false, null);
+ connection.configurePacketHandler(pipeline);
+ }
+ })
+ //? if <1.21.11 {
+ .channel(NioSocketChannel.class)
+ //?} else {
+ /*.channel(eventLoopHolder.channelCls())
+ *///?}
+ .connect(address, port)
+ .syncUninterruptibly();
return connection;
}
diff --git a/src/main/java/coffee/axle/proxy/mixin/ClientConnectionInit.java b/src/main/java/coffee/axle/proxy/mixin/ClientConnectionInit.java
index 44b39f6..64eab2e 100644
--- a/src/main/java/coffee/axle/proxy/mixin/ClientConnectionInit.java
+++ b/src/main/java/coffee/axle/proxy/mixin/ClientConnectionInit.java
@@ -1,14 +1,15 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy.mixin;
import coffee.axle.proxy.Coffeeproxy;
import coffee.axle.proxy.Proxy;
import io.netty.channel.ChannelPipeline;
-import io.netty.handler.proxy.Socks4ProxyHandler;
-import io.netty.handler.proxy.Socks5ProxyHandler;
+import io.netty.handler.proxy.ProxyHandler;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.BandwidthDebugMonitor;
-import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@@ -17,35 +18,14 @@
@Mixin(Connection.class)
public class ClientConnectionInit {
@Inject(method = "configureSerialization", at = @At("HEAD"))
- private static void onConfigureSerialization(ChannelPipeline pipeline, PacketFlow flow, boolean local,
- BandwidthDebugMonitor bandwidthDebugMonitor, CallbackInfo ci) {
- if (local || Coffeeproxy.suppressProxyMixin)
+ private static void onConfigureSerialization(ChannelPipeline pipe, PacketFlow flow, boolean local, BandwidthDebugMonitor bandwidthDebugMonitor, CallbackInfo ci) {
+ if (local || pipe.get(ProxyHandler.class) != null)
return;
Proxy proxy = Coffeeproxy.proxy;
if (Coffeeproxy.proxyEnabled) {
- Coffeeproxy.lastUsedProxy = proxy;
-
- switch (proxy.type) {
- case SOCKS5 -> pipeline.addFirst(new Socks5ProxyHandler(
- proxy.resolveProxyAddress(),
- proxy.username.isEmpty() ? null : proxy.username,
- proxy.password.isEmpty() ? null : proxy.password));
- case SOCKS4 -> pipeline.addFirst(new Socks4ProxyHandler(
- proxy.resolveProxyAddress(),
- proxy.username.isEmpty() ? null : proxy.username));
- case HTTP -> pipeline.addFirst(new io.netty.handler.proxy.HttpProxyHandler(
- proxy.resolveProxyAddress(),
- proxy.username.isEmpty() ? null : proxy.username,
- proxy.password.isEmpty() ? "" : proxy.password));
- }
- } else {
- Coffeeproxy.lastUsedProxy = new Proxy();
- }
-
- if (Coffeeproxy.proxyMenuButton != null) {
- Coffeeproxy.proxyMenuButton.setMessage(Component.literal("Proxy: " + Coffeeproxy.getLastUsedProxyIp()));
+ pipe.addFirst(proxy.getHandler());
}
}
}
diff --git a/src/main/java/coffee/axle/proxy/mixin/MultiplayerScreenOpen.java b/src/main/java/coffee/axle/proxy/mixin/MultiplayerScreenOpen.java
index 9aa07d8..6dc276c 100644
--- a/src/main/java/coffee/axle/proxy/mixin/MultiplayerScreenOpen.java
+++ b/src/main/java/coffee/axle/proxy/mixin/MultiplayerScreenOpen.java
@@ -1,10 +1,12 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
package coffee.axle.proxy.mixin;
-import coffee.axle.proxy.Config;
import coffee.axle.proxy.Coffeeproxy;
-import coffee.axle.proxy.GuiProxy;
+import coffee.axle.proxy.Config;
+import coffee.axle.proxy.GuiProxyList;
import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
import net.minecraft.client.gui.components.Button;
@@ -25,39 +27,41 @@ protected MultiplayerScreenOpen(Component title) {
super(title);
}
+ // init not repositionElements on 1.21.4/5/8: JoinMultiplayerScreen only declares the latter
+ // on 1.21.10+, loom can't remap inherited targets so the jar would keep mojmap names.
+ // 1.21.10+ overrides repositionElements WITHOUT super.rebuildWidgets, so init() never
+ // re-fires on resize there -> the button would drift. Both injects needed.
+ //? if <1.21.10 {
+ /*@Inject(method = "init()V", at = @At("TAIL"))
+ private void repositionProxyButton(CallbackInfo ci) {
+ handleProxyButton();
+ }
+ *///?}
+ //? if >=1.21.10 {
@Inject(method = "repositionElements()V", at = @At("TAIL"))
private void repositionProxyButton(CallbackInfo ci) {
- if (coffeeProxy$proxyMenuButton == null) {
- String playerName = Minecraft.getInstance().getUser().getName();
- if (!playerName.equals(Config.lastPlayerName)) {
- Config.lastPlayerName = playerName;
- if (Config.accounts.containsKey(playerName)) {
- Coffeeproxy.proxy = Config.accounts.get(playerName);
- } else {
- if (Config.accounts.containsKey("")) {
- Coffeeproxy.proxy = Config.accounts.get("");
- }
- }
- }
+ handleProxyButton();
+ }
+ //?}
+ @Unique
+ private void handleProxyButton() {
+ if (coffeeProxy$proxyMenuButton == null) {
JoinMultiplayerScreen ms = (JoinMultiplayerScreen) (Object) this;
coffeeProxy$proxyMenuButton = Button
- .builder(Component.literal("Proxy: " + Coffeeproxy.getLastUsedProxyIp()), (buttonWidget) -> {
- //? if <26.2 {
- Minecraft.getInstance().setScreen(new GuiProxy(ms));
- //?} else {
- /*Minecraft.getInstance().gui.setScreen(new GuiProxy(ms));
- *///?}
+ .builder(Component.literal("Proxy: "), (buttonWidget) -> {
+ Coffeeproxy.openScreen(new GuiProxyList(ms));
}).size(120, 20).build();
}
-
+ // suggestion (also commission?) from a random guy to "hide" it - like i guess man
if (!FabricLoader.getInstance().isModLoaded("modmenu") || Config.showMultiplayerButton) {
if (!this.children().contains(coffeeProxy$proxyMenuButton)) {
this.addRenderableWidget(coffeeProxy$proxyMenuButton);
}
}
- Coffeeproxy.proxyMenuButton = coffeeProxy$proxyMenuButton;
+ coffeeProxy$proxyMenuButton.setMessage(Component.literal(
+ "Proxy: " + (Config.activeName.isEmpty() ? "none" : Config.activeName)));
coffeeProxy$proxyMenuButton.setPosition(this.width - 125, 5);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/coffeeproxy/lang/en_us.json b/src/main/resources/assets/coffeeproxy/lang/en_us.json
index 786016c..a3dfd25 100644
--- a/src/main/resources/assets/coffeeproxy/lang/en_us.json
+++ b/src/main/resources/assets/coffeeproxy/lang/en_us.json
@@ -4,14 +4,24 @@
"ui.coffeeproxy.options.proxyType": "Proxy Type: ",
"ui.coffeeproxy.options.auth": "Proxy Authentication (optional)",
"ui.coffeeproxy.options.ipPort": "IP:PORT: ",
- "ui.coffeeproxy.options.apply": "Apply",
+ "ui.coffeeproxy.options.name": "Name: ",
+ "ui.coffeeproxy.options.save": "Save",
"ui.coffeeproxy.options.cancel": "Cancel",
"ui.coffeeproxy.options.test": "Test",
- "ui.coffeeproxy.options.proxyEnabled": "Proxy Enabled",
"ui.coffeeproxy.options.showMultiplayerButton": "Show in Multiplayer Screen",
+ "ui.coffeeproxy.list.title": "Proxies",
+ "ui.coffeeproxy.list.connect": "Connect",
+ "ui.coffeeproxy.list.disconnect": "Disconnect",
+ "ui.coffeeproxy.list.delete": "Delete",
+ "ui.coffeeproxy.list.refresh": "Refresh All",
+ "ui.coffeeproxy.list.add": "Add",
+ "ui.coffeeproxy.list.edit": "Edit",
+ "ui.coffeeproxy.list.done": "Done",
+ "ui.coffeeproxy.list.failed": "Failed",
"ui.coffeeproxy.auth.id": "User ID: ",
"ui.coffeeproxy.auth.username": "Username: ",
"ui.coffeeproxy.auth.password": "Password: ",
+ "ui.coffeeproxy.err.specName": "Specify a name",
"ui.coffeeproxy.err.specProxy": "Specify proxy to test",
"ui.coffeeproxy.err.cantConnect": "Can't connect to proxy",
"ui.coffeeproxy.err.cantPing": "Can't ping %d",
From 73e90e10f47d4af6ba1c185f56f8e1ac2eeb98d9 Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 05:54:36 +0000
Subject: [PATCH 5/9] bump to gradle 9.8.1
---
gradle/wrapper/gradle-wrapper.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbc3ce4..1a31fd1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
From 7e772d2649d854260ef3616453b0fa0ff7fba19e Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 06:00:20 +0000
Subject: [PATCH 6/9] cleanup abstraction because stonecutter is #near
---
src/main/java/coffee/axle/proxy/Draw.java | 35 ++++++++++++
src/main/java/coffee/axle/proxy/GuiProxy.java | 56 +++++--------------
.../java/coffee/axle/proxy/GuiProxyList.java | 26 ++-------
3 files changed, 52 insertions(+), 65 deletions(-)
create mode 100644 src/main/java/coffee/axle/proxy/Draw.java
diff --git a/src/main/java/coffee/axle/proxy/Draw.java b/src/main/java/coffee/axle/proxy/Draw.java
new file mode 100644
index 0000000..7e9a2fd
--- /dev/null
+++ b/src/main/java/coffee/axle/proxy/Draw.java
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+package coffee.axle.proxy;
+
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.EditBox;
+
+// abstracted or smth because of stonecutter if else coming to HARM ME
+final class Draw {
+ static void text(GuiGraphics g, Font font, String s, int x, int y, int color) {
+ //? if <26 {
+ g.drawString(font, s, x, y, color);
+ //?} else {
+ /*g.text(font, s, x, y, color);
+ *///?}
+ }
+
+ static void centeredText(GuiGraphics g, Font font, String s, int x, int y, int color) {
+ //? if <26 {
+ g.drawCenteredString(font, s, x, y, color);
+ //?} else {
+ /*g.centeredText(font, s, x, y, color);
+ *///?}
+ }
+
+ static void widget(GuiGraphics g, EditBox box, int mouseX, int mouseY, float partialTicks) {
+ //? if <26 {
+ box.render(g, mouseX, mouseY, partialTicks);
+ //?} else {
+ /*box.extractWidgetRenderState(g, mouseX, mouseY, partialTicks);
+ *///?}
+ }
+}
diff --git a/src/main/java/coffee/axle/proxy/GuiProxy.java b/src/main/java/coffee/axle/proxy/GuiProxy.java
index 3080acf..d987662 100644
--- a/src/main/java/coffee/axle/proxy/GuiProxy.java
+++ b/src/main/java/coffee/axle/proxy/GuiProxy.java
@@ -95,63 +95,33 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
super.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
*///?}
- //? if <26 {
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.name").getString(),
+ Draw.text(guiGraphics, this.font, Component.translatable("ui.coffeeproxy.options.name").getString(),
positionX, positionY[1] - 10, 0xFFA0A0A0);
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
+ Draw.text(guiGraphics, this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
positionX, positionY[2] - 10, 0xFFA0A0A0);
- guiGraphics.drawCenteredString(this.font,
+ Draw.centeredText(guiGraphics, this.font,
Component.translatable("ui.coffeeproxy.options.auth").getString(), this.width / 2, positionY[4] + 8,
0xFFFFFFFF);
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.options.ipPort").getString(),
+ Draw.text(guiGraphics, this.font, Component.translatable("ui.coffeeproxy.options.ipPort").getString(),
positionX, positionY[3] - 10, 0xFFA0A0A0);
- this.name.render(guiGraphics, mouseX, mouseY, partialTicks);
- this.ipPort.render(guiGraphics, mouseX, mouseY, partialTicks);
+ Draw.widget(guiGraphics, this.name, mouseX, mouseY, partialTicks);
+ Draw.widget(guiGraphics, this.ipPort, mouseX, mouseY, partialTicks);
if (currentType == Proxy.ProxyType.SOCKS4) {
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.auth.id").getString(),
+ Draw.text(guiGraphics, this.font, Component.translatable("ui.coffeeproxy.auth.id").getString(),
positionX, positionY[5] - 10, 0xFFA0A0A0);
- this.username.render(guiGraphics, mouseX, mouseY, partialTicks);
+ Draw.widget(guiGraphics, this.username, mouseX, mouseY, partialTicks);
} else {
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.auth.password").getString(),
+ Draw.text(guiGraphics, this.font, Component.translatable("ui.coffeeproxy.auth.password").getString(),
positionX, positionY[6] - 10, 0xFFA0A0A0);
- guiGraphics.drawString(this.font, Component.translatable("ui.coffeeproxy.auth.username").getString(),
+ Draw.text(guiGraphics, this.font, Component.translatable("ui.coffeeproxy.auth.username").getString(),
positionX, positionY[5] - 10, 0xFFA0A0A0);
- this.username.render(guiGraphics, mouseX, mouseY, partialTicks);
- this.password.render(guiGraphics, mouseX, mouseY, partialTicks);
+ Draw.widget(guiGraphics, this.username, mouseX, mouseY, partialTicks);
+ Draw.widget(guiGraphics, this.password, mouseX, mouseY, partialTicks);
}
- guiGraphics.drawCenteredString(this.font, !msg.isEmpty() ? msg : testPing.state, this.width / 2,
+ Draw.centeredText(guiGraphics, this.font, !msg.isEmpty() ? msg : testPing.state, this.width / 2,
positionY[7] + 5, 0xFFA0A0A0);
- //?} else {
- /*guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.name").getString(),
- positionX, positionY[1] - 10, 0xFFA0A0A0);
- guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.proxyType").getString(),
- positionX, positionY[2] - 10, 0xFFA0A0A0);
- guiGraphics.centeredText(this.font,
- Component.translatable("ui.coffeeproxy.options.auth").getString(), this.width / 2, positionY[4] + 8,
- 0xFFFFFFFF);
- guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.options.ipPort").getString(),
- positionX, positionY[3] - 10, 0xFFA0A0A0);
-
- this.name.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
- this.ipPort.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
- if (currentType == Proxy.ProxyType.SOCKS4) {
- guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.auth.id").getString(),
- positionX, positionY[5] - 10, 0xFFA0A0A0);
- this.username.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
- } else {
- guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.auth.password").getString(),
- positionX, positionY[6] - 10, 0xFFA0A0A0);
- guiGraphics.text(this.font, Component.translatable("ui.coffeeproxy.auth.username").getString(),
- positionX, positionY[5] - 10, 0xFFA0A0A0);
- this.username.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
- this.password.extractWidgetRenderState(guiGraphics, mouseX, mouseY, partialTicks);
- }
-
- guiGraphics.centeredText(this.font, !msg.isEmpty() ? msg : testPing.state, this.width / 2,
- positionY[7] + 5, 0xFFA0A0A0);
- *///?}
}
@Override
diff --git a/src/main/java/coffee/axle/proxy/GuiProxyList.java b/src/main/java/coffee/axle/proxy/GuiProxyList.java
index bd1e178..db86359 100644
--- a/src/main/java/coffee/axle/proxy/GuiProxyList.java
+++ b/src/main/java/coffee/axle/proxy/GuiProxyList.java
@@ -139,11 +139,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
this.deleteButton.active = selected != null;
this.editButton.active = selected != null;
- //? if <26 {
- guiGraphics.drawCenteredString(this.font, TEXT_TITLE, this.width / 2, 8, 0xFFFFFFFF);
- //?} else {
- /*guiGraphics.centeredText(this.font, TEXT_TITLE, this.width / 2, 8, 0xFFFFFFFF);
- *///?}
+ Draw.centeredText(guiGraphics, this.font, TEXT_TITLE, this.width / 2, 8, 0xFFFFFFFF);
}
@Override
@@ -297,30 +293,16 @@ public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
}
//?}
- //? if <26 {
private void drawRow(GuiGraphics guiGraphics) {
int color = rowColor();
String ping = pingText();
- guiGraphics.drawString(GuiProxyList.this.font, this.name, this.rowLeft + 2, this.rowTop + 2, color);
- guiGraphics.drawString(GuiProxyList.this.font, this.proxy.ipPort, this.rowLeft + 2, this.rowTop + 13, 0xFF808080);
+ Draw.text(guiGraphics, GuiProxyList.this.font, this.name, this.rowLeft + 2, this.rowTop + 2, color);
+ Draw.text(guiGraphics, GuiProxyList.this.font, this.proxy.ipPort, this.rowLeft + 2, this.rowTop + 13, 0xFF808080);
int iconX = this.rowLeft + this.rowWidth - 14;
ResourceLocation sprite = ResourceLocation.withDefaultNamespace("server_list/" + pingSprite());
guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, sprite,
iconX, this.rowTop + 2, 10, 8);
- guiGraphics.drawString(GuiProxyList.this.font, ping, iconX - 2 - GuiProxyList.this.font.width(ping), this.rowTop + 2, color);
+ Draw.text(guiGraphics, GuiProxyList.this.font, ping, iconX - 2 - GuiProxyList.this.font.width(ping), this.rowTop + 2, color);
}
- //?} else {
- /*private void drawRow(GuiGraphics guiGraphics) {
- int color = rowColor();
- String ping = pingText();
- guiGraphics.text(GuiProxyList.this.font, this.name, this.rowLeft + 2, this.rowTop + 2, color);
- guiGraphics.text(GuiProxyList.this.font, this.proxy.ipPort, this.rowLeft + 2, this.rowTop + 13, 0xFF808080);
- int iconX = this.rowLeft + this.rowWidth - 14;
- ResourceLocation sprite = ResourceLocation.withDefaultNamespace("server_list/" + pingSprite());
- guiGraphics.blitSprite(RenderPipelines.GUI_TEXTURED, sprite,
- iconX, this.rowTop + 2, 10, 8);
- guiGraphics.text(GuiProxyList.this.font, ping, iconX - 2 - GuiProxyList.this.font.width(ping), this.rowTop + 2, color);
- }
- *///?}
}
}
From fe5a1db5ef1e0b2eb9cf2f668ab1ac4071a83f7f Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 06:37:30 +0000
Subject: [PATCH 7/9] minor cleanup
---
src/main/java/coffee/axle/proxy/GuiProxyList.java | 1 -
src/main/java/coffee/axle/proxy/Proxy.java | 13 +++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/coffee/axle/proxy/GuiProxyList.java b/src/main/java/coffee/axle/proxy/GuiProxyList.java
index db86359..ae7fc61 100644
--- a/src/main/java/coffee/axle/proxy/GuiProxyList.java
+++ b/src/main/java/coffee/axle/proxy/GuiProxyList.java
@@ -229,7 +229,6 @@ private String pingText() {
return "";
}
- // vanilla ServerSelectionList bands: <=150 full bars, then 300/600/1000
private String pingSprite() {
long l = this.testPing.latency;
if (l < 0) {
diff --git a/src/main/java/coffee/axle/proxy/Proxy.java b/src/main/java/coffee/axle/proxy/Proxy.java
index 45e66dc..cc07207 100644
--- a/src/main/java/coffee/axle/proxy/Proxy.java
+++ b/src/main/java/coffee/axle/proxy/Proxy.java
@@ -99,16 +99,13 @@ public InetSocketAddress resolveProxyAddress() {
return cachedAddress;
}
+ private String meowEmpty(String value, String fallback) { return value.isEmpty() ? fallback : value; }
+
public ProxyHandler getHandler() {
return switch (type) {
- case SOCKS5 -> new Socks5ProxyHandler(resolveProxyAddress(),
- username.isEmpty() ? null : username,
- password.isEmpty() ? null : password);
- case SOCKS4 -> new Socks4ProxyHandler(resolveProxyAddress(),
- username.isEmpty() ? null : username);
- case HTTP -> new HttpProxyHandler(resolveProxyAddress(),
- username.isEmpty() ? null : username,
- password.isEmpty() ? "" : password);
+ case SOCKS5 -> new Socks5ProxyHandler(resolveProxyAddress(), meowEmpty(username, null), meowEmpty(password, null));
+ case SOCKS4 -> new Socks4ProxyHandler(resolveProxyAddress(), meowEmpty(username, null));
+ case HTTP -> new HttpProxyHandler(resolveProxyAddress(), meowEmpty(username, null), meowEmpty(password, ""));
};
}
From 579d0fca08df96e41be59666c429bb3f48094a4c Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 09:54:37 +0000
Subject: [PATCH 8/9] import/export
---
.../coffee/axle/proxy/GuiImportExport.java | 227 ++++++++++++++++++
.../java/coffee/axle/proxy/GuiProxyList.java | 9 +-
.../assets/coffeeproxy/lang/en_us.json | 14 +-
3 files changed, 247 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/coffee/axle/proxy/GuiImportExport.java
diff --git a/src/main/java/coffee/axle/proxy/GuiImportExport.java b/src/main/java/coffee/axle/proxy/GuiImportExport.java
new file mode 100644
index 0000000..a640c48
--- /dev/null
+++ b/src/main/java/coffee/axle/proxy/GuiImportExport.java
@@ -0,0 +1,227 @@
+// SPDX-FileCopyrightText: 2026 Axle Duggan (axlecoffee)
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+package coffee.axle.proxy;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+
+public class GuiImportExport extends Screen {
+ private static final HttpClient HTTP = HttpClient.newBuilder()
+ .connectTimeout(Duration.ofSeconds(10)).build();
+
+ private static final String TEXT_TITLE = Component.translatable("ui.coffeeproxy.io.title").getString();
+ private static final String TEXT_UNDEFINED = ChatFormatting.RED
+ + Component.translatable("ui.coffeeproxy.io.undefined").getString();
+ private static final String TEXT_FETCHING = Component.translatable("ui.coffeeproxy.io.fetching").getString();
+ private static final String TEXT_FETCH_ERROR = ChatFormatting.RED
+ + Component.translatable("ui.coffeeproxy.io.fetchError").getString();
+ private static final String TEXT_COPIED = ChatFormatting.GREEN
+ + Component.translatable("ui.coffeeproxy.io.copied").getString();
+
+ private final Screen parentScreen;
+
+ private EditBox urlBox;
+ private Button urlButton;
+ private Button saveOverwrite;
+ private Button saveAppend;
+
+ private String msg = "";
+ private LinkedHashMap pending;
+ // written by the fetch thread, consumed on the tick (main) thread
+ private volatile String fetched;
+ private volatile boolean fetchFailed;
+ private boolean fetching;
+
+ public GuiImportExport(Screen parentScreen) {
+ super(Component.literal(TEXT_TITLE));
+ this.parentScreen = parentScreen;
+ }
+
+ @Override
+ public void init() {
+ int w = 160;
+ int x = (this.width - w) / 2;
+ int y0 = (this.height - 180) / 2;
+ String savedUrl = this.urlBox == null ? "" : this.urlBox.getValue();
+
+ this.urlBox = new EditBox(this.font, x, y0 + 24, w, 20, Component.literal(""));
+ this.urlBox.setValue(savedUrl);
+ this.urlBox.setMaxLength(1024);
+ this.addWidget(this.urlBox);
+
+ this.addRenderableWidget(Button.builder(Component.translatable("ui.coffeeproxy.io.clipboard"),
+ button -> applyPayload(this.minecraft.keyboardHandler.getClipboard()))
+ .bounds(x, y0, w, 20).build());
+
+ this.urlButton = this.addRenderableWidget(Button.builder(Component.translatable("ui.coffeeproxy.io.url"),
+ button -> fetchUrl())
+ .bounds(x, y0 + 48, w, 20).build());
+ this.urlButton.active = !this.fetching;
+
+ this.saveOverwrite = this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.io.overwrite"), button -> save(true))
+ .bounds(x, y0 + 88, w, 20).build());
+ this.saveAppend = this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.io.append"), button -> save(false))
+ .bounds(x, y0 + 112, w, 20).build());
+ refreshSaves();
+
+ this.addRenderableWidget(Button.builder(Component.translatable("ui.coffeeproxy.io.export"),
+ button -> exportClipboard())
+ .bounds(x, y0 + 136, w, 20).build());
+
+ this.addRenderableWidget(Button.builder(Component.translatable("ui.coffeeproxy.list.done"),
+ button -> onClose())
+ .bounds(x, y0 + 160, w, 20).build());
+ }
+
+ // clipboard is either raw json ({ at pos1) or base64 of it, anything else is Undefined!
+ private static LinkedHashMap parsePayload(String text) {
+ try {
+ String json = text == null ? "" : text.trim();
+ if (!json.startsWith("{")) {
+ json = new String(Base64.getDecoder().decode(json), StandardCharsets.UTF_8);
+ }
+ JsonElement proxies = JsonParser.parseString(json).getAsJsonObject().get("proxies");
+ if (proxies == null || !proxies.isJsonObject()) {
+ return null;
+ }
+ LinkedHashMap out = new LinkedHashMap<>();
+ for (var entry : proxies.getAsJsonObject().entrySet()) {
+ out.put(entry.getKey(), entry.getValue().getAsString());
+ }
+ return out;
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private void applyPayload(String text) {
+ LinkedHashMap parsed = parsePayload(text);
+ if (parsed == null) {
+ this.pending = null;
+ this.msg = TEXT_UNDEFINED;
+ } else {
+ this.pending = parsed;
+ this.msg = ChatFormatting.GREEN
+ + Component.translatable("ui.coffeeproxy.io.loaded", parsed.size()).getString();
+ }
+ refreshSaves();
+ }
+
+ private void fetchUrl() {
+ String url = this.urlBox.getValue().trim();
+ this.fetching = true;
+ this.urlButton.active = false;
+ this.msg = TEXT_FETCHING;
+ new Thread(() -> {
+ String body = "";
+ boolean failed = false;
+ try {
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .timeout(Duration.ofSeconds(10))
+ .GET().build();
+ body = HTTP.send(request, BodyHandlers.ofString()).body();
+ } catch (Exception e) {
+ // bad url / timeout / refused
+ failed = true;
+ }
+ this.fetchFailed = failed;
+ this.fetched = body;
+ }, "CoffeeProxy importer").start();
+ }
+
+ private void refreshSaves() {
+ this.saveOverwrite.active = this.pending != null;
+ this.saveAppend.active = this.pending != null;
+ }
+
+ private void save(boolean overwrite) {
+ if (this.pending == null) {
+ return;
+ }
+ if (overwrite) {
+ Config.proxies.clear();
+ Config.proxies.putAll(this.pending);
+ Config.setActive(Config.proxies.containsKey(Config.activeName) ? Config.activeName : "");
+ } else {
+ // colliding names get a number so re-importing the same list duplicates instead of replaces
+ for (var entry : this.pending.entrySet()) {
+ String name = entry.getKey();
+ for (int n = 2; Config.proxies.containsKey(name); n++) {
+ name = entry.getKey() + " " + n;
+ }
+ Config.proxies.put(name, entry.getValue());
+ }
+ }
+ Config.saveConfig();
+ Coffeeproxy.openScreen(this.parentScreen);
+ }
+
+ private void exportClipboard() {
+ // the exported list doubles as the selected payload, so export -> save round trips without another click
+ this.pending = new LinkedHashMap<>(Config.proxies);
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ JsonObject root = new JsonObject();
+ root.add("proxies", gson.toJsonTree(this.pending));
+ String b64 = Base64.getEncoder().encodeToString(gson.toJson(root).getBytes(StandardCharsets.UTF_8));
+ this.minecraft.keyboardHandler.setClipboard(b64);
+ this.msg = TEXT_COPIED;
+ refreshSaves();
+ }
+
+ @Override
+ public void tick() {
+ if (this.fetched == null) {
+ return;
+ }
+ String text = this.fetched;
+ this.fetched = null;
+ this.fetching = false;
+ this.urlButton.active = true;
+ if (this.fetchFailed) {
+ this.pending = null;
+ this.msg = TEXT_FETCH_ERROR;
+ refreshSaves();
+ } else {
+ applyPayload(text);
+ }
+ }
+
+ @Override
+ //? if <26 {
+ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+ super.render(guiGraphics, mouseX, mouseY, partialTicks);
+ //?} else {
+ /*public void extractRenderState(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+ super.extractRenderState(guiGraphics, mouseX, mouseY, partialTicks);
+ *///?}
+ int y0 = (this.height - 180) / 2;
+ Draw.centeredText(guiGraphics, this.font, this.msg, this.width / 2, y0 + 74, 0xFFA0A0A0);
+ Draw.widget(guiGraphics, this.urlBox, mouseX, mouseY, partialTicks);
+ }
+
+ @Override
+ public void onClose() {
+ Coffeeproxy.openScreen(this.parentScreen);
+ }
+}
diff --git a/src/main/java/coffee/axle/proxy/GuiProxyList.java b/src/main/java/coffee/axle/proxy/GuiProxyList.java
index ae7fc61..cf84ecf 100644
--- a/src/main/java/coffee/axle/proxy/GuiProxyList.java
+++ b/src/main/java/coffee/axle/proxy/GuiProxyList.java
@@ -46,6 +46,11 @@ public void init() {
this.proxyList.addProxy(entry.getKey(), entry.getValue());
}
+ this.addRenderableWidget(Button
+ .builder(Component.translatable("ui.coffeeproxy.list.importExport"),
+ button -> Coffeeproxy.openScreen(new GuiImportExport(this)))
+ .bounds(8, 8, 100, 20).build());
+
int x1 = this.width / 2 - 154;
int x2 = x1 + 104;
int x3 = x1 + 208;
@@ -139,7 +144,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
this.deleteButton.active = selected != null;
this.editButton.active = selected != null;
- Draw.centeredText(guiGraphics, this.font, TEXT_TITLE, this.width / 2, 8, 0xFFFFFFFF);
+ Draw.centeredText(guiGraphics, this.font, TEXT_TITLE, this.width / 2, 14, 0xFFFFFFFF);
}
@Override
@@ -151,7 +156,7 @@ public void onClose() {
private class ProxyList extends ObjectSelectionList {
ProxyList(Minecraft minecraft) {
- super(minecraft, GuiProxyList.this.width, GuiProxyList.this.height - 116, 28, 36);
+ super(minecraft, GuiProxyList.this.width, GuiProxyList.this.height - 124, 36, 36);
}
@Override
diff --git a/src/main/resources/assets/coffeeproxy/lang/en_us.json b/src/main/resources/assets/coffeeproxy/lang/en_us.json
index a3dfd25..4ed4eb3 100644
--- a/src/main/resources/assets/coffeeproxy/lang/en_us.json
+++ b/src/main/resources/assets/coffeeproxy/lang/en_us.json
@@ -16,6 +16,7 @@
"ui.coffeeproxy.list.refresh": "Refresh All",
"ui.coffeeproxy.list.add": "Add",
"ui.coffeeproxy.list.edit": "Edit",
+ "ui.coffeeproxy.list.importExport": "Import/Export",
"ui.coffeeproxy.list.done": "Done",
"ui.coffeeproxy.list.failed": "Failed",
"ui.coffeeproxy.auth.id": "User ID: ",
@@ -27,5 +28,16 @@
"ui.coffeeproxy.err.cantPing": "Can't ping %d",
"ui.coffeeproxy.err.cantPingReason": "Can't ping %d: %d",
"ui.coffeeproxy.ping.pinging": "Pinging %d...",
- "ui.coffeeproxy.ping.showPing": "Ping: %dms"
+ "ui.coffeeproxy.ping.showPing": "Ping: %dms",
+ "ui.coffeeproxy.io.title": "Import/Export",
+ "ui.coffeeproxy.io.clipboard": "Import from Clipboard",
+ "ui.coffeeproxy.io.url": "Import from URL",
+ "ui.coffeeproxy.io.overwrite": "Save (overwrite)",
+ "ui.coffeeproxy.io.append": "Save (append)",
+ "ui.coffeeproxy.io.export": "Export to Clipboard",
+ "ui.coffeeproxy.io.fetching": "Fetching...",
+ "ui.coffeeproxy.io.loaded": "Loaded %d Proxies!",
+ "ui.coffeeproxy.io.undefined": "Undefined!",
+ "ui.coffeeproxy.io.fetchError": "Failed to fetch from URL",
+ "ui.coffeeproxy.io.copied": "Copied to clipboard!"
}
\ No newline at end of file
From 7fb15a147cf7623f83340046601f8218e2cfc45e Mon Sep 17 00:00:00 2001
From: axlecoffee <95949634+axlecoffee@users.noreply.github.com>
Date: Thu, 8 Oct 2026 09:58:00 +0000
Subject: [PATCH 9/9] cleanup
---
src/main/java/coffee/axle/proxy/GuiImportExport.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/coffee/axle/proxy/GuiImportExport.java b/src/main/java/coffee/axle/proxy/GuiImportExport.java
index a640c48..2ab3ebe 100644
--- a/src/main/java/coffee/axle/proxy/GuiImportExport.java
+++ b/src/main/java/coffee/axle/proxy/GuiImportExport.java
@@ -46,7 +46,6 @@ public class GuiImportExport extends Screen {
private String msg = "";
private LinkedHashMap pending;
- // written by the fetch thread, consumed on the tick (main) thread
private volatile String fetched;
private volatile boolean fetchFailed;
private boolean fetching;
@@ -142,7 +141,9 @@ private void fetchUrl() {
.GET().build();
body = HTTP.send(request, BodyHandlers.ofString()).body();
} catch (Exception e) {
+ // TODO: display error CODE?
// bad url / timeout / refused
+ e.printStackTrace();
failed = true;
}
this.fetchFailed = failed;
@@ -164,7 +165,7 @@ private void save(boolean overwrite) {
Config.proxies.putAll(this.pending);
Config.setActive(Config.proxies.containsKey(Config.activeName) ? Config.activeName : "");
} else {
- // colliding names get a number so re-importing the same list duplicates instead of replaces
+ // duplicate names get number appended since it's just logical
for (var entry : this.pending.entrySet()) {
String name = entry.getKey();
for (int n = 2; Config.proxies.containsKey(name); n++) {
@@ -178,7 +179,6 @@ private void save(boolean overwrite) {
}
private void exportClipboard() {
- // the exported list doubles as the selected payload, so export -> save round trips without another click
this.pending = new LinkedHashMap<>(Config.proxies);
Gson gson = new GsonBuilder().setPrettyPrinting().create();
JsonObject root = new JsonObject();