commit 85a7fb2a55f970830063af4d5de0589a218a9609 Author: garrettmills Date: Tue Feb 9 10:27:16 2021 -0600 Initial import diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..b74d795 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,8 @@ +kind: pipeline +name: default +type: docker +steps: + - name: Run the Gradle build + image: glmdev/java-gradle-maven + commands: + ./gradlew build shadowJar reobfShadowJar diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12f8644 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt diff --git a/CREDITS.txt b/CREDITS.txt new file mode 100644 index 0000000..a70c53d --- /dev/null +++ b/CREDITS.txt @@ -0,0 +1,65 @@ +Minecraft Forge: Credits/Thank You + +Forge is a set of tools and modifications to the Minecraft base game code to assist +mod developers in creating new and exciting content. It has been in development for +several years now, but I would like to take this time thank a few people who have +helped it along it's way. + +First, the people who originally created the Forge projects way back in Minecraft +alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance +of me taking over the project, who knows what Minecraft modding would be today. + +Secondly, someone who has worked with me, and developed some of the core features +that allow modding to be as functional, and as simple as it is, cpw. For developing +FML, which stabelized the client and server modding ecosystem. As well as the base +loading system that allows us to modify Minecraft's code as elegently as possible. + +Mezz, who has stepped up as the issue and pull request manager. Helping to keep me +sane as well as guiding the community into creating better additions to Forge. + +Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which +I am a part}. For creating some of the core tools needed to make Minecraft modding +both possible, and as stable as can be. + On that note, here is some specific information of the MCP data we use: + * Minecraft Coder Pack (MCP) * + Forge Mod Loader and Minecraft Forge have permission to distribute and automatically + download components of MCP and distribute MCP data files. This permission is not + transitive and others wishing to redistribute the Minecraft Forge source independently + should seek permission of MCP or remove the MCP data files and request their users + to download MCP separately. + +And lastly, the countless community members who have spent time submitting bug reports, +pull requests, and just helping out the community in general. Thank you. + +--LexManos + +========================================================================= + +This is Forge Mod Loader. + +You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml + +This minecraft mod is a clean open source implementation of a mod loader for minecraft servers +and minecraft clients. + +The code is authored by cpw. + +It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. +http://www.minecraftforum.net/topic/75440- +This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. + +It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. +http://www.minecraftforge.net/ + +Additionally, it contains an implementation of topological sort based on that +published at http://keithschwarz.com/interesting/code/?dir=topological-sort + +It also contains code from the Maven project for performing versioned dependency +resolution. http://maven.apache.org/ + +It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ +with credit to it's authors. + +Forge Mod Loader downloads components from the Minecraft Coder Pack +(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3999d8e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,61 @@ +FROM openjdk:8-jdk-alpine + +LABEL Garrett Mills + +RUN apk add --no-cache curl tar bash procps + +# Downloading and installing Maven +ARG MAVEN_VERSION=3.6.3 +ARG USER_HOME_DIR="/root" +ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries + +RUN mkdir -p /usr/share/maven /usr/share/maven/ref \ + && echo "Downlaoding maven" \ + && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \ + \ + && echo "Unziping maven" \ + && tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 \ + \ + && echo "Cleaning and setting links" \ + && rm -f /tmp/apache-maven.tar.gz \ + && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn + +ENV MAVEN_HOME /usr/share/maven +ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" + +# Downloading and installing Gradle +# 1- Define a constant with the version of gradle you want to install +ARG GRADLE_VERSION=4.10.3 + +# 2- Define the URL where gradle can be downloaded from +ARG GRADLE_BASE_URL=https://services.gradle.org/distributions + +# 3- Define the SHA key to validate the gradle download +# obtained from here https://gradle.org/release-checksums/ +ARG GRADLE_SHA=8626cbf206b4e201ade7b87779090690447054bc93f052954c78480fa6ed186e + +# 4- Create the directories, download gradle, validate the download, install it, remove downloaded file and set links +RUN mkdir -p /usr/share/gradle /usr/share/gradle/ref \ + && echo "Downlaoding gradle hash" \ + && curl -fsSL -o /tmp/gradle.zip ${GRADLE_BASE_URL}/gradle-${GRADLE_VERSION}-bin.zip \ + \ + && echo "Checking download hash" \ + && echo "${GRADLE_SHA} /tmp/gradle.zip" | sha256sum -c - \ + \ + && echo "Unziping gradle" \ + && unzip -d /usr/share/gradle /tmp/gradle.zip \ + \ + && echo "Cleaning and setting links" \ + && rm -f /tmp/gradle.zip \ + && ln -s /usr/share/gradle/gradle-${GRADLE_VERSION} /usr/bin/gradle + +# 5- Define environmental variables required by gradle +ENV GRADLE_VERSION 4.10.3 +ENV GRADLE_HOME /usr/bin/gradle +ENV GRADLE_USER_HOME /cache + +ENV PATH $PATH:$GRADLE_HOME/bin + +VOLUME $GRADLE_USER_HOME + +CMD [""] diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..b0cbe2b --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,520 @@ +Unless noted below, Minecraft Forge, Forge Mod Loader, and all +parts herein are licensed under the terms of the LGPL 2.1 found +here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and +copied below. + +Homepage: http://minecraftforge.net/ + https://github.com/MinecraftForge/MinecraftForge + + +A note on authorship: +All source artifacts are property of their original author, with +the exclusion of the contents of the patches directory and others +copied from it from time to time. Authorship of the contents of +the patches directory is retained by the Minecraft Forge project. +This is because the patches are partially machine generated +artifacts, and are changed heavily due to the way forge works. +Individual attribution within them is impossible. + +Consent: +All contributions to Forge must consent to the release of any +patch content to the Forge project. + +A note on infectivity: +The LGPL is chosen specifically so that projects may depend on Forge +features without being infected with its license. That is the +purpose of the LGPL. Mods and others using this code via ordinary +Java mechanics for referencing libraries are specifically not bound +by Forge's license for the Mod code. + + +=== MCP Data === +This software includes data from the Minecraft Coder Pack (MCP), with kind permission +from them. The license to MCP data is not transitive - distribution of this data by +third parties requires independent licensing from the MCP team. This data is not +redistributable without permission from the MCP team. + +=== Sharing === +I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of +the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. + +-- Runtime patcher -- +License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher +and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +-- ASM transformers -- +License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) +under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +========================================================================= +This software includes portions from the Apache Maven project at +http://maven.apache.org/ specifically the ComparableVersion.java code. It is +included based on guidelines at +http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html +with notices intact. The only change is a non-functional change of package name. + +This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating +binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ +authored by genman, heikok, pivot. +The only changes are to replace some Trove collection types with standard Java collections, and repackaged. +========================================================================= + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..6904b37 --- /dev/null +++ b/README.txt @@ -0,0 +1,53 @@ +------------------------------------------- +Source installation information for modders +------------------------------------------- +This code follows the Minecraft Forge installation methodology. It will apply +some small patches to the vanilla MCP source code, giving you and it access +to some of the data and functions you need to build a successful mod. + +Note also that the patches are built against "unrenamed" MCP source code (aka +srgnames) - this means that you will not be able to read them directly against +normal code. + +Source pack installation information: + +Standalone source installation +============================== + +See the Forge Documentation online for more detailed instructions: +http://mcforge.readthedocs.io/en/latest/gettingstarted/ + +Step 1: Open your command-line and browse to the folder where you extracted the zip file. + +Step 2: You're left with a choice. +If you prefer to use Eclipse: +1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux) +2. Open Eclipse, Import > Existing Gradle Project > Select Folder + or run "gradlew eclipse" to generate the project. +(Current Issue) +4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment +5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4. + +If you prefer to use IntelliJ: +1. Open IDEA, and import project. +2. Select your build.gradle file and have it import. +3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux) +4. Refresh the Gradle Project in IDEA if required. + +If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again. + +Should it still not work, +Refer to #ForgeGradle on EsperNet for more information about the gradle environment. +or the Forge Project Discord discord.gg/UvedJ9m + +Forge source installation +========================= +MinecraftForge ships with this code and installs it as part of the forge +installation process, no further action is required on your part. + +LexManos' Install Video +======================= +https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be + +For more details update more often refer to the Forge Forums: +http://www.minecraftforge.net/forum/index.php/topic,14048.0.html diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4170a78 --- /dev/null +++ b/build.gradle @@ -0,0 +1,178 @@ +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + jcenter() + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4' + } +} + +apply plugin: 'com.github.johnrengelman.shadow' +apply plugin: 'java' +apply plugin: 'net.minecraftforge.gradle' +// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +apply plugin: 'eclipse' +apply plugin: 'maven-publish' + +version = '1.3' +group = 'dev.garrettmills.csx.matterlinkreboot' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'matterlinkreboot' + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. + +println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) +minecraft { + // The mappings can be changed at any time, and must be in the following format. + // snapshot_YYYYMMDD Snapshot are built nightly. + // stable_# Stables are built at the discretion of the MCP team. + // Use non-default mappings at your own risk. they may not always work. + // Simply re-run your setup task after changing the mappings to update your workspace. + mappings channel: 'snapshot', version: '20201028-1.16.3' + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + matterlinkreboot { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + matterlinkreboot { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', 'matterlinkreboot', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + + mods { + matterlinkreboot { + source sourceSets.main + } + } + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +dependencies { + // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft 'net.minecraftforge:forge:1.16.4-35.1.37' + + // You may put jars on which you depend on in ./libs or you may define them like so.. + // compile "some.group:artifact:version:classifier" + // compile "some.group:artifact:version" + + // Real examples + // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // These dependencies get remapped to your current MCP mappings + // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // For more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + + shadow "org.apache.httpcomponents:httpclient:4.5.10" +} + +// Example for how to get properties into the manifest for reading by the runtime.. +jar { + manifest { + attributes([ + "Specification-Title": "matterlinkreboot", + "Specification-Vendor": "matterlinkrebootsareus", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"matterlinkrebootsareus", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + + +shadowJar { + configurations = [project.configurations.shadow] + manifest { + attributes([ + "Specification-Title": "matterlinkreboot", + "Specification-Vendor": "matterlinkrebootsareus", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"matterlinkrebootsareus", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + relocate "org.apache.http", "matterlinkreboot.org.apache.http" + relocate "org.apache.commons.logging", "matterlinkreboot.org.apache.commons.logging" + relocate "org.apache.commons.codec", "matterlinkreboot.org.apache.commons.codec" +} + +reobf { shadowJar { } } +tasks.reobfShadowJar.mustRunAfter shadowJar + +// Example configuration to allow publishing using the maven-publish task +// This is the preferred method to reobfuscate your jar file +jar.finalizedBy('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +//publish.dependsOn('reobfJar') + +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } + } +} \ No newline at end of file diff --git a/changelog.txt b/changelog.txt new file mode 100644 index 0000000..037d2e3 --- /dev/null +++ b/changelog.txt @@ -0,0 +1,1669 @@ +Build: 1.16.4-35.1.37 - Thu Jan 14 23:58:35 GMT 2021 + lex: + Update Coremods, ASM, and include standalone Nashorn to load on J15. + +========= +Build: 1.16.4-35.1.36 - Thu Jan 07 20:24:49 GMT 2021 + ian.rehwinkel: + Added IWeatherParticleRenderHandler to allow a mod to take control over weather particles and sounds. (#7522) + +========= +Build: 1.16.4-35.1.35 - Thu Jan 07 20:16:03 GMT 2021 + Laughlan Coventry: + Allow Chunk loading Tickets to opt-into forcing chunk ticks. (#7525) + +========= +Build: 1.16.4-35.1.34 - Thu Jan 07 20:10:18 GMT 2021 + malte0811: + Fix crash when mods add goals to skeleton horses (MC-206338) (#7509) + +========= +Build: 1.16.4-35.1.33 - Thu Jan 07 20:03:59 GMT 2021 + diesieben07: + Set WM_CLASS and WM_INSTANCE_NAME for early progress window (#7534) + +========= +Build: 1.16.4-35.1.32 - Wed Jan 06 03:17:35 GMT 2021 + 35673674+alcatrazEscapee: + Make UnboundedMapCodec more lenient in decoding dimensions. Fixes MC-197860 (#7527) + +========= +Build: 1.16.4-35.1.31 - Tue Jan 05 19:59:52 GMT 2021 + lex: + Prevent NPE and deprecated MissingMappings.getMappings function. Closes #6252 + + lex: + Fix FML's Config Sync packet not allowing same length filenames in encoder and decoder. Closes #7584 + +========= +Build: 1.16.4-35.1.29 - Sun Jan 03 11:02:59 GMT 2021 + lex: + Fix entities not correctly being able to be ridden under water. + +========= +Build: 1.16.4-35.1.28 - Mon Dec 28 21:56:51 GMT 2020 + git: + Fix crash when beehive is broken by fake player (#7566) + +========= +Build: 1.16.4-35.1.27 - Mon Dec 28 21:46:04 GMT 2020 + 35673674+alcatrazEscapee: + Add supplier variant to `AbstractBlock.Properties#lootFrom` (#7563) + +========= +Build: 1.16.4-35.1.26 - Mon Dec 28 21:40:18 GMT 2020 + diesieben07: + Fix missing serializers when deserializing global loot modifiers (#7561) + + diesieben07: + Fix ModFileResourcePack.getAllResourceLocations ignoring resourceNamespace. (#7562) + + Fixes #7405 + +========= +Build: 1.16.4-35.1.24 - Mon Dec 28 21:34:39 GMT 2020 + diesieben07: + Fix VanillaConnectionNetworkFilter sending out invalid entity properties packets without an entity ID (#7560) + +========= +Build: 1.16.4-35.1.23 - Mon Dec 28 21:17:01 GMT 2020 + richard: + Make shear interactions extend to subclasses (#7544) + +========= +Build: 1.16.4-35.1.22 - Mon Dec 28 21:09:38 GMT 2020 + sciwhiz12: + Add a SoundType subclass that uses suppliers (#7538) + +========= +Build: 1.16.4-35.1.21 - Mon Dec 28 21:03:56 GMT 2020 + sciwhiz12: + Fix compound ingredient in shapeless recipes (#7537) Fixes #7530 + +========= +Build: 1.16.4-35.1.20 - Mon Dec 28 20:19:04 GMT 2020 + matthrewp: + Fix modded PointOfInterestType's not populating blockstate map when registered (#7503) + + 35673674+alcatrazEscapee: + Fix potential NPE in ForgeHooks.onItemPlaceIntoWorld when passing in null player. (#7505) + +========= +Build: 1.16.4-35.1.18 - Mon Dec 28 20:13:15 GMT 2020 + 48399898+poopoodice: + Add new LivingConversionEvent to control mobs turning into other mobs. (#7386) + +========= +Build: 1.16.4-35.1.17 - Mon Dec 28 20:01:42 GMT 2020 + knightminer4: + Add ItemAttributeModifierEvent (#7484) + +========= +Build: 1.16.4-35.1.16 - Mon Dec 28 19:54:38 GMT 2020 + Bward7864: + Fix RightClickBlock ALLOW not being implemented (#7426) + +========= +Build: 1.16.4-35.1.15 - Sat Dec 26 19:39:35 GMT 2020 + lex: + Make mod data packs able to be disabled. It'll break things, but that's on you. Closes #6776 + + lex: + Quiet down errors related to modders not changing their update urls from the default. + +========= +Build: 1.16.4-35.1.13 - Sat Dec 12 17:34:07 GMT 2020 + tterrag: + Add generated resource tracking to ExistingFileHelper + +========= +Build: 1.16.4-35.1.12 - Fri Dec 11 02:39:41 GMT 2020 + tterrag: + Fix BlockStateProvider item models not knowing about block models + + Add tests for this case + +========= +Build: 1.16.4-35.1.11 - Tue Dec 08 19:54:40 GMT 2020 + richard: + Override invalidateCaps instead of remove for vanilla TE capability invalidation (#7536) + + Properly invalidate patched in vanilla TE caps in invalidateCaps instead of remove so that they get invalidated on chunk unload + +========= +Build: 1.16.4-35.1.10 - Sat Dec 05 20:07:14 GMT 2020 + richard: + Make TEs invalidate capabilities when the chunk they are in unloads (#7529) + + Fixed LazyOptional potentially notifying invalidation listeners multiple times. + +========= +Build: 1.16.4-35.1.9 - Sat Dec 05 20:01:00 GMT 2020 + Cordonfreeman: + Fixed entity navigation to stop entities spinning - MC-94054 (#7520) + +========= +Build: 1.16.4-35.1.8 - Sat Dec 05 19:52:56 GMT 2020 + 20846147+Unbekannt1998: + Fix wrong function call in BlockStateProvider::horizontalFaceBlock (#7514) + +========= +Build: 1.16.4-35.1.7 - Sun Nov 29 02:11:08 GMT 2020 + tterrag: + Fix datagen order of multipart conditions being unstable + +========= +Build: 1.16.4-35.1.6 - Sat Nov 28 02:56:55 GMT 2020 + 35673674+alcatrazEscapee: + Fix forge config option for default world type not applying unless you change the default world type (#7521) + +========= +Build: 1.16.4-35.1.5 - Fri Nov 27 23:57:23 GMT 2020 + David Quintana: + Implement feature for mods to define new world types (#7448) + + * Mods can now register world types via a new forge registry, and optionally register a settings screen to tweak them. + * The default world type for dedicated servers and singleplayer world creation is configurable via forge's common config. + +========= +Build: 1.16.4-35.1.4 - Tue Nov 24 17:14:21 GMT 2020 + csh2001331: + Fix dimType not encode to registries (#7513) + +========= +Build: 1.16.4-35.1.3 - Mon Nov 23 03:45:21 GMT 2020 + richard: + Add support for referencing forge's resources and specifying existing mods to data generators (#7456) + +========= +Build: 1.16.4-35.1.2 - Sun Nov 22 22:01:29 GMT 2020 + cpw: + Fix #6692 + + Thanks @AterAnimAvis for help and suggestions + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.1.1 - Sat Nov 21 19:57:45 GMT 2020 + cyborgmas18: + Fix translucent blocks not rendering properly when moved by pistons on fabulous (#7441) + +========= +Build: 1.16.4-35.1.0 - Fri Nov 20 20:54:30 GMT 2020 + lex: + Bump version for RB. + +========= +Build: 1.16.4-35.0.22 - Fri Nov 20 18:24:46 GMT 2020 + 35673674+alcatrazEscapee: + Fix MC-194811 - Removing structures causes chunk save errors. + + diesieben07: + Fix food bar not rendering when non-living entities are mounted (#7446) + +========= +Build: 1.16.4-35.0.20 - Fri Nov 20 18:18:37 GMT 2020 + diesieben07: + Fix concurrency issue in StartupMessageManager (#7483) + +========= +Build: 1.16.4-35.0.19 - Fri Nov 20 18:11:25 GMT 2020 + 35673674+alcatrazEscapee: + Fix forge registry types that have private constructors (BlockStateProviderType, BlockPlacerType, FoliagePlacerType, TreeDecoratorType) (#7482) + +========= +Build: 1.16.4-35.0.18 - Sun Nov 15 16:08:55 GMT 2020 + cpw: + Fix problem where the absence of forge and MC in later loading triggered a weird crash. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.17 - Sat Nov 14 01:41:38 GMT 2020 + cpw: + Fix NPE problem when modid is mismatched. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.16 - Sat Nov 14 00:18:29 GMT 2020 + cpw: + Return the processed modlist data to the upstream system, not the raw unprocessed data. Should resolve the problem + that mixin complains about missing info when it's in a "crashed" situation. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.15 - Wed Nov 11 09:09:45 GMT 2020 + cyborgmas18: + Fix dims on servers not loading the first run (#7445) + +========= +Build: 1.16.4-35.0.14 - Tue Nov 10 20:24:33 GMT 2020 + diesieben07: + Allow for custom argument types by filtering them on vanilla connections (#7463) + +========= +Build: 1.16.4-35.0.13 - Tue Nov 10 20:13:34 GMT 2020 + Bward7864: + Add Player context to AnvilUpdateEvent (#7442) + +========= +Build: 1.16.4-35.0.12 - Tue Nov 10 20:02:33 GMT 2020 + git: + Don't overwrite PlayerAdvancement's player with a fake one (#7454) + + If a FakePlayer is constructed with the same UUID/GameProfile as a + currently active player, the player object within PlayerAdvancement is + set to the fake player. + + As fake players cannot receive advancements (see grantCriterion), this + prevents the actual player from receiving any advancements until they + change dimension/relog. + +========= +Build: 1.16.4-35.0.11 - Tue Nov 10 19:46:01 GMT 2020 + curle: + Add BannerBlock.forColor to SAS to fix banner.toItem() on servers. + +========= +Build: 1.16.4-35.0.10 - Tue Nov 10 19:36:40 GMT 2020 + Boy132: + Call Harvest check event even if the block doesn't require any tool (#7414) + +========= +Build: 1.16.4-35.0.9 - Tue Nov 10 19:25:26 GMT 2020 + lex: + Use linked collections to stabilize order when adding new registry entries. + + xfacthd: + Render local player when the renderViewEntity is not the local player (#7216) + +========= +Build: 1.16.4-35.0.7 - Sun Nov 08 04:12:02 GMT 2020 + cpw: + Some help in ExtensionPoint regarding DISPLAYTEST. Let's improve those tick rates! + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.6 - Sun Nov 08 03:30:37 GMT 2020 + cpw: + Handle erroring during early mod construction phases, and actually report that into the error UI + by doing armslength exception handling and propagation. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.5 - Sun Nov 08 01:48:22 GMT 2020 + cpw: + Support backwards loading 1.16.3 mods in 1.16.4, because we are able to do that. Tweak loading a bit to be smarter about dependency errors of various kinds. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.4 - Sat Nov 07 20:10:44 GMT 2020 + David Quintana: + Add FluidStack codec, and a test mod that verifies its behaviour matches the existing write/read logic. + Add missing license headers. + +========= +Build: 1.16.4-35.0.3 - Sat Nov 07 02:11:47 GMT 2020 + cpw: + Update event bus version (should be 3.0.5) + + Tweak MDK to automatically populate recommended values for things like forge version, loader version and minecraft version. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.2 - Wed Nov 04 00:07:58 GMT 2020 + diesieben07: + Workaround for modded attributes on vanilla entities logging warnings on vanilla clients + + Switch to a handler-based approach per packet class, simplify patch, add some docs + + Add license header and docs + + Switch to a network handler based approach + + Switch to a network handler based approach + + revert build gradle change + + Simplify Packet patch + + Add license header to IForgePacket + + Revert ForgeHooks changes + + Less hacky and more generic way to filter packets for vanilla connections + + _Actually_ Order SAS. + It's early + + Order SAS + + simplify vanilla connection check + + Remove unneeded import change + +========= +Build: 1.16.4-35.0.1 - Mon Nov 02 19:57:45 GMT 2020 + cpw: + Fix early sorting bug that meant the file deduping was causing an error, to, well, not cause it, so we can get to an error screen. + + Signed-off-by: cpw + +========= +Build: 1.16.4-35.0.0 - Mon Nov 02 19:15:50 GMT 2020 + lex: + 1.16.4 Initial Update + +========= +Build: 1.16.3-34.1.42 - Mon Nov 02 04:30:53 GMT 2020 + lex: + Fix Biomes not properly copying over ids loaded from the save to the new Dynamic Registry. + +========= +Build: 1.16.3-34.1.41 - Mon Nov 02 01:09:57 GMT 2020 + David Quintana: + Introduce custom loader additions to the model data generators. (#7450) + + Currently implemented loaders: + * OBJ + * Composite + * Multi-layer + * Item layers (vanilla item/generated but with fullbright texture support) + * Bucket + * Separate Perspective + +========= +Build: 1.16.3-34.1.40 - Mon Nov 02 00:52:12 GMT 2020 + cpw: + actually rollback on error in registry events. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.39 - Sun Nov 01 22:09:32 GMT 2020 + cpw: + Update modlauncher. fixes #7452 + + Signed-off-by: cpw + + cpw: + Return client resources even if no data pack found on server. Closes #6225 (Pull request) + + Signed-off-by: cpw + + tobias.hotz: + Auto-detect ansi support for log4j2 + + move to fml.loading subpackage + + Add license header + + cpw: + Fix config parse failure causing crash in building exception message. fixes #7438 + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.35 - Thu Oct 29 17:09:31 GMT 2020 + malte0811: + Fix (NonNull)Lazy.Concurrent using a global lock (#7403) + + * Fix Lazy.Concurrent using a global lock, thus preventing multiple threads from resolving independent Lazy's at the same time + * Use Lazy with an added null check to implement NonNullLazy + +========= +Build: 1.16.3-34.1.34 - Thu Oct 29 00:12:09 GMT 2020 + David Quintana: + Update forge mappings to 20201028-1.16.3 (#7435) + +========= +Build: 1.16.3-34.1.33 - Tue Oct 27 16:01:02 GMT 2020 + 35673674+alcatrazEscapee: + Fix breaking changes from the Biome rename PR #7434 (#7439) + +========= +Build: 1.16.3-34.1.32 - Mon Oct 26 23:52:47 GMT 2020 + sciwhiz12: + Reimplement nametag distance attribute, fix attribute translation keys (#7387) + +========= +Build: 1.16.3-34.1.31 - Mon Oct 26 22:07:02 GMT 2020 + 35673674+alcatrazEscapee: + Fix data pack biomes failing to load in SingleBiomeProvider (#7434) + +========= +Build: 1.16.3-34.1.30 - Mon Oct 26 22:00:28 GMT 2020 + cpw: + Add in proper handling of equals and hashcode for modjar urls. Fixes very slow loading on windows. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.29 - Mon Oct 26 12:51:24 GMT 2020 + cpw: + Force 8.0.5 ML + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.28 - Mon Oct 26 11:32:40 GMT 2020 + cpw: + Restore FingerprintViolationEvent with appropriate THIS IS F*CKING DEAD DELET WARNINGS. + Also, notify in UI if using legacy JDK without capability to read out security data from mod jars. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.27 - Mon Oct 26 02:27:48 GMT 2020 + cpw: + Rollback registries to vanilla state if something happens during loading, so subsequent activities can still run and not generate false reports.. + + Signed-off-by: cpw + + cpw: + Add signature reporting for mods, using new signature capture from ModLauncher. Need to figure out + how to reflect Minecraft's JAR signatures into here. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.25 - Tue Oct 20 19:32:40 GMT 2020 + lex: + Fix mcp_snapshot mapping issue causing unneeded patches. Closes #7424 + +========= +Build: 1.16.3-34.1.24 - Tue Oct 20 11:26:03 GMT 2020 + David Quintana: + Fix resource leak in the OBJ loader. + +========= +Build: 1.16.3-34.1.23 - Fri Oct 16 19:10:02 GMT 2020 + djbake101: + Fix issue with ITeleporter allowing easier use of vanilla logic. (#7317) + +========= +Build: 1.16.3-34.1.22 - Thu Oct 15 19:49:26 GMT 2020 + richard: + Adds tag support for Enchantments, Potions, and TileEntityTypes (#7379) + +========= +Build: 1.16.3-34.1.21 - Thu Oct 15 19:43:33 GMT 2020 + lex: + Resuscitate BiomeDictionary using RegistryKeys instead of biome references. + +========= +Build: 1.16.3-34.1.20 - Thu Oct 15 17:15:15 GMT 2020 + FinntheRaider: + Add event for player changing game mode (#7355) + +========= +Build: 1.16.3-34.1.19 - Mon Oct 12 18:11:22 GMT 2020 + cpw: + Fix RCON multipacket responses not actually understanding UTF8. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.18 - Mon Oct 12 01:49:09 GMT 2020 + cpw: + Fix RCON not sending newlines in output for multiline. Fixes https://bugs.mojang.com/browse/MC-7569, a very old bug that is really annoying if you use RCON. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.17 - Sat Oct 10 16:45:26 GMT 2020 + championash5357: + Fix Texture Presence String (#7408) + +========= +Build: 1.16.3-34.1.16 - Fri Oct 09 19:57:26 GMT 2020 + lex: + Fix typo causing potential error in vine growth. Closes #7406 + Sort missing registry dumps by name, making it easier to read. + +========= +Build: 1.16.3-34.1.15 - Fri Oct 09 13:58:36 GMT 2020 + David Quintana: + Fixed conditional advancement loading when using the "advancements" array. + Added automatic generation of conditional advancements from the criteria in the conditional recipe entries. + Added advancement name calculation from the recipe ID. + +========= +Build: 1.16.3-34.1.14 - Thu Oct 08 21:08:45 GMT 2020 + 32142731+Flanks255: + Additions to the mdk build.gradle to accommodate datagens. (#7398) + +========= +Build: 1.16.3-34.1.13 - Thu Oct 08 21:02:59 GMT 2020 + Colby Prince: + Added Basic Class-Level SAS Capability to checkSAS, added Vector4f to SAS (#7385) + +========= +Build: 1.16.3-34.1.12 - Wed Oct 07 20:04:11 GMT 2020 + richard: + Add hooks to allow modification of structures spawn lists (#7344) + +========= +Build: 1.16.3-34.1.11 - Tue Oct 06 19:38:36 GMT 2020 + richard: + Add back patches to Screen allowing for item tooltips to be auto wrapped again (#7378) + + Only deals with the methods receiving an ItemStack or ITextComponent(s), the methods that take IReorderingProcessor(s) are left alone. + +========= +Build: 1.16.3-34.1.10 - Mon Oct 05 14:34:56 GMT 2020 + adam: + Bump mixin version to 0.8.2 + +========= +Build: 1.16.3-34.1.9 - Mon Oct 05 10:30:12 GMT 2020 + cpw: + Remove redundant call to CrashReport generator - Vanilla is doing a crashreport for itself at startup now. + + Add a UUID into crashreport that is also logged in all channels at crash report generation time. This will allow to associate crash reports and the logs. + + Signed-off-by: cpw + + cpw: + Add in extra debug logging + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.7 - Sun Oct 04 19:51:37 GMT 2020 + cpw: + Modify how ModLoadingStage handles dispatch to Registry Events. Stops the objectholder spam and generally improves performance on larger packs. + + Signed-off-by: cpw + + cpw: + Fix doc README and answer lex's question + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.1.5 - Fri Oct 02 23:40:14 GMT 2020 + Colby Prince: + Added "Bukkit Plugin" to InvalidModIdentifier (#7384) + +========= +Build: 1.16.3-34.1.4 - Fri Oct 02 23:34:26 GMT 2020 + richard: + Fix vanilla Campfire smoke bug. MC-201374 (#7381) + +========= +Build: 1.16.3-34.1.3 - Fri Oct 02 23:28:31 GMT 2020 + sciwhiz12: + Fix toggleable keybindings still being active while in GUI Fixes #7370 (#7373) + +========= +Build: 1.16.3-34.1.2 - Fri Oct 02 22:06:59 GMT 2020 + dev: + Fix modded EntityClassifications not being useable in the codec. (#7337) + +========= +Build: 1.16.3-34.1.1 - Mon Sep 28 18:02:11 GMT 2020 + cech12: + Support effective materials of vanilla AxeItem (#7351) + +========= +Build: 1.16.3-34.1.0 - Thu Sep 24 07:05:13 GMT 2020 + lex: + Prep new RB. + +========= +Build: 1.16.3-34.0.21 - Thu Sep 24 06:46:57 GMT 2020 + ichttt: + Fix grass disappearing when alwaysSetupTerrainOffThread is true (#7291) + +========= +Build: 1.16.3-34.0.20 - Thu Sep 24 06:41:41 GMT 2020 + 35673674+alcatrazEscapee: + Accessors for inspecting and removal of biome generation settings. Fixed carvers still being immutable. (#7339) + +========= +Build: 1.16.3-34.0.19 - Thu Sep 24 06:36:25 GMT 2020 + lex: + Revive BiomeManager and BiomeLayer hooks. + +========= +Build: 1.16.3-34.0.18 - Thu Sep 24 03:12:19 GMT 2020 + richard: + Fix a few minor issues with custom tag types and fix OptionalNamedTags (#7316) + +========= +Build: 1.16.3-34.0.17 - Wed Sep 23 22:10:11 GMT 2020 + diesieben07: + Fix ToggleableKeyBinding differences to vanilla. (#7338) + +========= +Build: 1.16.3-34.0.16 - Wed Sep 23 21:34:47 GMT 2020 + Yunus1903: + Updated build badge versions to 1.16.3 in readme (#7325) + + diesieben07: + Fix forge light pipeline applying block offsets twice (#7323) + +========= +Build: 1.16.3-34.0.14 - Wed Sep 23 21:16:46 GMT 2020 + ichttt: + Add a better license error screen (#7350) + +========= +Build: 1.16.3-34.0.13 - Tue Sep 22 19:14:17 GMT 2020 + darklime: + Fixed container item being consumed in brewing stand. #7307 (#7314) + +========= +Build: 1.16.3-34.0.12 - Tue Sep 22 19:06:10 GMT 2020 + sciwhiz12: + Fix parse results of CommandEvent being disregarded (#7303) + +========= +Build: 1.16.3-34.0.11 - Tue Sep 22 18:58:28 GMT 2020 + 17338378+Nightenom: + [1.16] Fix possible crash when using rendering regionCache (#7207) + +========= +Build: 1.16.3-34.0.10 - Tue Sep 22 18:41:16 GMT 2020 + 35673674+alcatrazEscapee: + [1.16] Reimplement ICloudRenderHandler, ISkyRenderHandler and IWeatherRenderHandler (#6994) + +========= +Build: 1.16.3-34.0.9 - Fri Sep 18 00:58:08 GMT 2020 + 35673674+alcatrazEscapee: + Make Biome.Climate and BiomeAmbiance fields accessible (#7336) + +========= +Build: 1.16.3-34.0.8 - Thu Sep 17 20:42:53 GMT 2020 + cpw: + Use mixin 0.8.1. Should fix problems with mixin not working properly with latest modlauncher. + + Signed-off-by: cpw + +========= +Build: 1.16.3-34.0.7 - Tue Sep 15 20:07:25 GMT 2020 + sebastian: + Sets the empty/fill sounds for vanilla fluids. + Use Fluid's fillSound rather than emptySound when filling buckets. + +========= +Build: 1.16.3-34.0.6 - Tue Sep 15 19:47:08 GMT 2020 + cyborgmas18: + Add MatrixStack-aware alternatives to the methods in GuiUtils (#7127) + +========= +Build: 1.16.3-34.0.5 - Tue Sep 15 16:51:58 GMT 2020 + justin_wiblin: + Fix json biomes not setting registry name correctly for the BiomeLoadingEvent. (#7329) + +========= +Build: 1.16.3-34.0.4 - Tue Sep 15 14:18:16 GMT 2020 + David Quintana: + Fix inconsistencies in how the values from the model are passed into the baked model. + This puts them in line with vanilla, as intended. + +========= +Build: 1.16.3-34.0.3 - Tue Sep 15 13:23:05 GMT 2020 + Yunus1903: + Reimplemented drawHoveringText (#7268) + +========= +Build: 1.16.3-34.0.2 - Tue Sep 15 00:43:19 GMT 2020 + lex: + New BiomeLoadingEvent that allows modders to edit biomes as they are being deserialized. + +========= +Build: 1.16.3-34.0.1 - Fri Sep 11 15:55:28 GMT 2020 + lex: + Bump MCP version for lambda issue. + +========= +Build: 1.16.3-34.0.0 - Thu Sep 10 19:10:33 GMT 2020 + lex: + 1.16.3 Update + Also included a bunch of warning cleanups. + +========= +Build: 1.16.2-33.0.61 - Thu Sep 10 18:54:56 GMT 2020 + 42962686+RedstoneDubstep: + Fix tile entities being replaced when not needed. (#7318) + +========= +Build: 1.16.2-33.0.60 - Thu Sep 10 18:02:15 GMT 2020 + malte0811: + Fix exception when getting rendering box for tile entities with no collision boxes. (#7301) + +========= +Build: 1.16.2-33.0.59 - Wed Sep 09 23:05:21 GMT 2020 + cpw: + More crash reporting tweaks. Don't crash when trying to show warnings. Also, put the exception name in the error screen on the second line! + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.58 - Wed Sep 09 17:09:09 GMT 2020 + diesieben07: + Fix Minecart speed cap on rail being initialized to 0 (#7315) + +========= +Build: 1.16.2-33.0.57 - Wed Sep 09 02:10:45 GMT 2020 + richard: + Add support for custom tag types (#7289) + +========= +Build: 1.16.2-33.0.56 - Wed Sep 09 00:06:22 GMT 2020 + cpw: + More crash report tweaks. Put a button to open the generated crash report on the error screen, tweak formatting of crash report, and add the enhanced stack trace data (transformers et al) + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.55 - Tue Sep 08 21:00:19 GMT 2020 + championash5357: + New hook for better custom scaffolding movement (#7261) + +========= +Build: 1.16.2-33.0.54 - Tue Sep 08 20:47:48 GMT 2020 + mrtschipp: + Add partialTicks to RenderNameplateEvent (#7277) + + cyborgmas18: + Prevent duplicate wrapper tags from crashing (#7283) + + matthrewp: + Fix custom teleporters NPE (#7296) + + cyborgmas18: + Fixed crash with zip paths (#7300) + +========= +Build: 1.16.2-33.0.50 - Tue Sep 08 20:23:27 GMT 2020 + nrbeech: + Fixing logic in getCurrentRailPosition to correctly identify the rail… (#7276) + +========= +Build: 1.16.2-33.0.49 - Tue Sep 08 20:14:58 GMT 2020 + sciwhiz12: + Remove dead ForgeHooks.canToolHarvestBlock function. (#7262) + + sciwhiz12: + Bump resource pack version to 6 (#7299) + + Edwin.mindcraft: + [1.16.x] Fixes for Bamboo, Enchantments and Conduits, small adjustments to bring some patches closer to the vanilla code. (#7239) + +========= +Build: 1.16.2-33.0.46 - Tue Sep 08 19:50:14 GMT 2020 + championash5357: + Re-implement DrawHighlightEvent$HighlightEntity Firing (#7233) + +========= +Build: 1.16.2-33.0.45 - Tue Sep 08 19:25:58 GMT 2020 + ichttt: + Reimplement FarmlandWaterManager (#7213) + +========= +Build: 1.16.2-33.0.44 - Tue Sep 08 19:11:16 GMT 2020 + cyborgmas18: + Add dataprovider for Global Loot Modifiers (#6960) + +========= +Build: 1.16.2-33.0.43 - Tue Sep 08 19:01:09 GMT 2020 + ichttt: + Fix crash when dumping crash report for an exception that has a null cause (#7308) + +========= +Build: 1.16.2-33.0.42 - Mon Sep 07 01:29:40 GMT 2020 + cpw: + Tweak crash report dump to visit all the causes up to the top. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.41 - Sun Sep 06 23:39:13 GMT 2020 + cpw: + Fix ExplodedDirectoryLocator visiting non-existent paths. Closes #7203 + + Also, bump modlauncher to 7.0.1 to fix resources. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.40 - Sun Sep 06 22:08:22 GMT 2020 + cpw: + Use new enumeration mechanism in ModLauncher, to allow getResources to work. This enables serviceloader-in-mods, and other stuff that might need to visit multiple mod jars. Also, tweaked the visitor code slightly, may result in a trivial performance change. Closing #7302 as it's not really relevant any more. + + Signed-off-by: cpw + + cpw: + Park the polling thread for a bit, if we're not the one driving the task list forwards. This allows for the actual driver to work on low cpu count machines. + + Signed-off-by: cpw + + cpw: + Fix some potential issues in crash dumping during mod loading + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.37 - Thu Sep 03 16:37:38 GMT 2020 + cpw: + Fix compiler issue in eclipse properly + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.36 - Thu Sep 03 12:40:52 GMT 2020 + sciwhiz12: + Fix crash caused by previous commit (#7298) + +========= +Build: 1.16.2-33.0.35 - Thu Sep 03 04:15:27 GMT 2020 + lex: + Dirty casting hacks to fix eclipse compiler inference issue. I'm sorry cpw. + +========= +Build: 1.16.2-33.0.34 - Thu Sep 03 03:38:16 GMT 2020 + tterrag: + Fix broken ExistingFileHelper import + + Add licenses to some new files + + tterrag: + Add validation via resources for tag providers (#7271) + + BREAKING CHANGE: Moved ExistingFileHelper to common package + Remove various workarounds from forge tag providers + +========= +Build: 1.16.2-33.0.32 - Tue Sep 01 18:36:21 GMT 2020 + cpw: + Move the "modloading" thread activity onto _our_ worker pool. It turns out that the vanilla worker pool can deadlock during stitching if it's insufficiently large, if modloader "waitForTransition" is also a worker member of that pool. + + Closes #7293 (to reproduce issue easily, modify Util.func_240979_a_ and change the values in the MathHelper.clamp call). I've verified that 3 and below for "max" cause the problem. (I didn't test a whole range of values, just sufficient to reproduce problem and verify fix). Note that setting it to zero (and using the "direct executor" that's inaccessible in normal operation) works as well with this fix. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.31 - Tue Sep 01 02:27:07 GMT 2020 + cpw: + Fix missed debugging code. Read the config from the config. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.30 - Tue Sep 01 01:31:57 GMT 2020 + cpw: + Revert "Shut down all other mod handlers if the loading cycle errors. This prevents other mods from throwing errors and being blamed for initial cause. This is a temporary hack until cpw re-writes the mod event dispatcher." + + This reverts commit 7592bbe8 + + Signed-off-by: cpw + + cpw: + Revert "Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected." + + This reverts commit 30bad1e2 + + Signed-off-by: cpw + + cpw: + Redo event dispatch, removes a bunch of nonsense, and tries to integrate with the vanilla CF system where possible + + Signed-off-by: cpw + + cpw: + Fix up all the things. Removed SidedProvider because it served no real purpose anymore. + + Signed-off-by: cpw + + cpw: + Fix up slight registry change and other 1.16.2 stuffs. + + Signed-off-by: cpw + +========= +Build: 1.16.2-33.0.23 - Sun Aug 30 23:05:24 GMT 2020 + ichttt: + Add particle culling (#6981) + +========= +Build: 1.16.2-33.0.22 - Wed Aug 26 16:50:02 GMT 2020 + lex: + Wrap vanilla's 'default' biome registry in ForgeRegistry. + This should allow registering mod dimensions like in 1.16.1, while the data driven system is fleshed out. + +========= +Build: 1.16.2-33.0.21 - Tue Aug 25 01:11:38 GMT 2020 + David Quintana: + Clarify in the LazyOptional which methods carry the lazyness over to the returned value and which don't. (#6750) + + For consistency, this meant making a few changes: + - Renamed the existing lazy mapping method to lazyMap, to indicate that it doesn't run the mapping immediately. + - Added a new implementation of map(), which returns Optional, and resolves the value in the process. + - Changed filter() to return Optional, since there's no way to filter lazily. + - Added a new method resolve(), which helps convert the custom LazyOptional class into a standard Optional, for use + with library methods that expect Optional. + + * Update License headers. + +========= +Build: 1.16.2-33.0.20 - Fri Aug 21 21:27:21 GMT 2020 + sciwhiz12: + Add user-friendly exceptions when config loading fails (#7214) + +========= +Build: 1.16.2-33.0.19 - Fri Aug 21 18:53:46 GMT 2020 + dev: + Replace EntityHeight event with EntitySize event (#6858) + +========= +Build: 1.16.2-33.0.18 - Fri Aug 21 18:38:31 GMT 2020 + davide2910: + [1.16] ForgeEventFactory#canCreateFluidSource reintroduced (#7181) + +========= +Build: - Fri Aug 21 18:31:19 GMT 2020 + cyborgmas18: + Cleanup and expand Forge tags (#7004) + +========= +Build: 1.16.2-33.0.16 - Fri Aug 21 18:25:49 GMT 2020 + sciwhiz12: + Fix modproperties property in mods.toml causing exception (#7192) + +========= +Build: 1.16.2-33.0.15 - Fri Aug 21 18:15:53 GMT 2020 + me: + Log info about server list warning (#7209) + + Make it easier to figure out what mods are missing or have to be marked as client/server side only. + +========= +Build: 1.16.2-33.0.14 - Fri Aug 21 18:06:47 GMT 2020 + goto.minecraft: + Fix ItemStack#isDamageable is not calling Item#isDamagable (#7221) + +========= +Build: 1.16.2-33.0.13 - Fri Aug 21 17:48:58 GMT 2020 + diesieben07: + Improve performance and cleanup code for DelegatingResourcePack (#7228) + +========= +Build: 1.16.2-33.0.12 - Fri Aug 21 17:29:33 GMT 2020 + cyborgmas18: + Fix small logging issues with loading pack.png for mods (#7265) + +========= +Build: 1.16.2-33.0.11 - Fri Aug 21 17:23:30 GMT 2020 + diesieben07: + Fix config iteration order (#7230) + +========= +Build: 1.16.2-33.0.10 - Fri Aug 21 09:47:23 GMT 2020 + lex: + Cleanup Forge's build script, fix some unneeded patches. + Add checkExcscheckAll tasks. + +========= +Build: 1.16.2-33.0.9 - Fri Aug 21 04:35:17 GMT 2020 + championash5357: + Readding DifficultyChangeEvent hooks (#7240) + +========= +Build: 1.16.2-33.0.8 - Fri Aug 21 04:29:10 GMT 2020 + malte0811: + Improve startup time by caching the manifest data for mod jars (#7256) + +========= +Build: 1.16.2-33.0.7 - Wed Aug 19 05:47:46 GMT 2020 + Yunus1903: + Removed HarvestDropsEvent (#7193) + +========= +Build: 1.16.2-33.0.6 - Wed Aug 19 05:22:45 GMT 2020 + cyborgmas18: + Remove forge optional tags in favor of Vanilla's new system. (#7246) + +========= +Build: 1.16.2-33.0.5 - Fri Aug 14 19:05:15 GMT 2020 + lex: + Fix creating nether portals. + + lex: + New method for creating modded tag references, fix connecting to vanilla servers. + +========= +Build: 1.16.2-33.0.3 - Fri Aug 14 02:17:01 GMT 2020 + 43609023+spnda: + Print mod file name on InvalidModFileException (#7241) + +========= +Build: 1.16.2-33.0.2 - Thu Aug 13 19:26:22 GMT 2020 + cyborgmas18: + Fix server connection, misapplied patch (#7245) + + Yunus1903: + Updated MDK and README for 1.16.2 (#7243) + +========= +Build: 1.16.2-33.0.0 - Thu Aug 13 07:37:04 GMT 2020 + lex: + Initial 1.16.2 Update + +========= +Build: 1.16.1-32.0.108 - Sun Aug 09 20:05:01 GMT 2020 + David Quintana: + Fix ModelRegistryEvent firing every time resources reload instead of just once. + +========= +Build: 1.16.1-32.0.107 - Sat Aug 08 01:00:42 GMT 2020 + David Quintana: + Move ModelRegistryEvent invocation to when the model loading is about to start. + Freeze the ModelLoaderRegistry right after this event happens, just before model loading actually begins. + This means ModelRegistryEvent is now the correct place to register loaders, as it was intended. + This is a slight breaking change, but any mod that used FMLClientSetupEvent before will need to be updated regardless due to the existing race condition. + +========= +Build: 1.16.1-32.0.106 - Tue Aug 04 00:19:22 GMT 2020 + diesieben07: + Fix wrong BlockState param passed into canSustainPlant from FarmlandBlock (#7212) + +========= +Build: 1.16.1-32.0.105 - Tue Aug 04 00:06:45 GMT 2020 + sciwhiz12: + Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 (#7189) + +========= +Build: 1.16.1-32.0.104 - Tue Aug 04 00:00:40 GMT 2020 + sciwhiz12: + Fix debug world not generating modded blocks (#6926) + + championash5357: + New IForgeBlock#getToolModifiedState hook allow better control over tools interacting with blocks. (#7176) + + email.squishling: + Added new hook to allow Biomes to control their Edge biomes (#7000) + +========= +Build: 1.16.1-32.0.101 - Mon Aug 03 22:55:18 GMT 2020 + diesieben07: + Re-introduce "outdated" notification on Mods button in main menu (#7123) + + brandon4261: + Add support for custom elytra (#7202) + +========= +Build: 1.16.1-32.0.99 - Mon Aug 03 18:53:31 GMT 2020 + sciwhiz12: + Fix RenderTickEvent using wrong partial ticks value when game is paused. Fixes #6991 (#7208) + +========= +Build: 1.16.1-32.0.98 - Thu Jul 30 03:18:00 GMT 2020 + tterrag: + Implement forge IBakedModel methods in vanilla wrapper models + +========= +Build: 1.16.1-32.0.97 - Tue Jul 28 23:44:41 GMT 2020 + lex: + Fix another case of swallowed errors not shutting down mods. + +========= +Build: 1.16.1-32.0.96 - Tue Jul 28 21:40:06 GMT 2020 + lex: + Shut down all other mod handlers if the loading cycle errors. + This prevents other mods from throwing errors and being blamed for initial cause. + This is a temporary hack until cpw re-writes the mod event dispatcher. + +========= +Build: - Tue Jul 28 19:01:27 GMT 2020 + lex: + Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected. + + lex: + Enable EventBus type check during ForgeDev, and add IModBusEvent marker to ModelRegistryEvent. + +========= +Build: 1.16.1-32.0.93 - Tue Jul 28 07:16:31 GMT 2020 + lex: + Make license toml entry optional during 1.16.1 + There are to many existing mods to make this required. + Yes, we are technically before a RB and can do breaking changes. However this is too large. + +========= +Build: 1.16.1-32.0.92 - Tue Jul 28 01:14:20 GMT 2020 + cpw: + Missed one event. NewRegistry needs the marker. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.91 - Tue Jul 28 01:07:03 GMT 2020 + cpw: + Update MDK license to default to All rights reserved, and offer a link to chooseyourlicense.com as a place to research appropriate licenses. + + Note: the license field _is_ backwards compatible and will simply be ignored on older forge versions. + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.90 - Tue Jul 28 00:47:35 GMT 2020 + cpw: + Update modlauncher, eventbus, accesstransformers and more to use a newer mechanism for generating ASM. + + Introduced IModBusEvent as a marker interface for events on the ModBus. Expect exceptions if you use + the modbus for events not listened there. + + Signed-off-by: cpw + + cpw: + Update coremods and spi, include mandatory license field in metadata. Added at top level of mods.toml file. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.88 - Mon Jul 27 23:35:24 GMT 2020 + ray.neiheiser: + Fix rail 180 rotations (#7177) + + jmansfield: + Fire AnimalTameEvent for cats (#7172) Closes #7171 + +========= +Build: 1.16.1-32.0.86 - Mon Jul 27 22:56:16 GMT 2020 + lex: + Fix Biome generation error. + +========= +Build: 1.16.1-32.0.85 - Mon Jul 27 21:36:07 GMT 2020 + dev: + Fix SleepingTimeCheckEvent not being fired in initial sleep test. (#7005) + +========= +Build: 1.16.1-32.0.84 - Mon Jul 27 21:30:24 GMT 2020 + Yunus1903: + Fix ClimberPathNavigator spinning when width is small. Closes #6993 (#6997) + +========= +Build: 1.16.1-32.0.83 - Mon Jul 27 21:19:50 GMT 2020 + mrtschipp: + Re-added PlayerEvent.NameFormat (#6992) + +========= +Build: 1.16.1-32.0.82 - Mon Jul 27 21:14:02 GMT 2020 + email.squishling: + Fixed modded overworld biomes not spawning [1.16.x] (#6990) + +========= +Build: 1.16.1-32.0.81 - Mon Jul 27 21:08:23 GMT 2020 + christ.klinge: + Added EntityLeaveWorldEvent (#6984) + +========= +Build: 1.16.1-32.0.80 - Mon Jul 27 21:02:53 GMT 2020 + aqscode: + Re-implement moddable flammabilities (#6983) + +========= +Build: 1.16.1-32.0.79 - Mon Jul 27 20:46:11 GMT 2020 + diesieben07: + Re-add patch for PlayerSetSpawnEvent (#6977) + + Yunus1903: + Updated versions in README and removed flocker.tv mentions (#6978) + +========= +Build: 1.16.1-32.0.77 - Mon Jul 27 20:40:33 GMT 2020 + sciwhiz12: + Fix ChunkDataEvents using different data tags (#6961) Fixes #6957 + +========= +Build: - Mon Jul 27 20:27:00 GMT 2020 + joetarbit: + Post SoundLoadEvent on mod bus instead of forge bus (#6955) + +========= +Build: 1.16.1-32.0.75 - Wed Jul 22 01:26:19 GMT 2020 + cpw: + Remove startupquery. Currently wasn't functional, and 1.16 has out of band state loading in all cases, so the complex functionality there is no longer needed. Going to research using the Lifecycle indicator from DFU as a proxy/replacement. Probably with some codec FUN. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.74 - Wed Jul 22 00:34:43 GMT 2020 + lex: + Run Forge's data generators to sync 1.16 vanilla changes. + +========= +Build: 1.16.1-32.0.73 - Wed Jul 22 00:13:48 GMT 2020 + cpw: + Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds. + + Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.72 - Tue Jul 21 23:56:54 GMT 2020 + cpw: + Add mixin + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.71 - Mon Jul 20 22:56:31 GMT 2020 + cyborgmas18: + Load Modded Datapacks in DatapackScreen, before world creation (#6913) + +========= +Build: 1.16.1-32.0.70 - Sat Jul 18 22:35:53 GMT 2020 + tterrag: + Fix inconsistencies with model/blockstate datagen + +========= +Build: 1.16.1-32.0.69 - Fri Jul 17 17:35:47 GMT 2020 + dev: + Filter duplicate mod files from mod file scan data (#6855) + +========= +Build: 1.16.1-32.0.68 - Thu Jul 16 21:56:30 GMT 2020 + lex: + Fixed Forge commands. Closes #6973 Closes #6974 Closes #6976 + +========= +Build: 1.16.1-32.0.67 - Wed Jul 15 19:30:53 GMT 2020 + jaredlll08: + Added an event for registering commands. closes #6968 (#6969) + +========= +Build: 1.16.1-32.0.66 - Tue Jul 14 00:15:41 GMT 2020 + darklime: + Make all functions in Style common. (#6931) + +========= +Build: 1.16.1-32.0.65 - Mon Jul 13 22:44:53 GMT 2020 + 55965249+seymourimadeit: + Mark Raid.WaveMembers as an extensible enum. (#6878) + +========= +Build: 1.16.1-32.0.64 - Mon Jul 13 22:17:58 GMT 2020 + lex: + Fix checkPatches task. Closes #6956 + Fix patched in method using srg name. Closes #6965 + Fix capabilities not being collected for ClientWorld. Closes #6966 + Fix TagEmptyCondition using client side copy of tags instead of server. Closes #6949 + Fix ExtendedButton using narrator text. Closes #6958, Closes #6959 + Fix misaligned patch in RepairContainer. Closes #6950, Closes #6953 + Fix LivingJumpEvent not being fired for players jumping horses. Closes #6929 + Remove extra getToughness method in ArmorItem. Closes #6970 + Remove GetCollisionBoxesEvent. Closes #6921 + +========= +Build: 1.16.1-32.0.63 - Fri Jul 10 22:28:22 GMT 2020 + richard: + Fix race condition with DeferredRegister for custom registries (#6951) + +========= +Build: 1.16.1-32.0.62 - Fri Jul 10 17:49:51 GMT 2020 + sciwhiz12: + Remove hooks into beacon base/payments. Vanilla uses tags now for extensibility. (#6948) + +========= +Build: 1.16.1-32.0.61 - Wed Jul 08 21:33:38 GMT 2020 + jaredlll08: + Expose the DataPackRegistries instance to the AddReloadListenerEvent (#6933) + +========= +Build: 1.16.1-32.0.60 - Wed Jul 08 21:13:18 GMT 2020 + sciwhiz12: + Fix canRepair not being set true as default (#6936) + + Closes #6934 and #6935 + +========= +Build: 1.16.1-32.0.59 - Wed Jul 08 14:56:39 GMT 2020 + David Quintana: + Fix particles sometimes "losing" the lightmap and drawing fullbright. + + David Quintana: + Fix misaligned patch causing LivingEquipmentChangeEvent to never be posted. + +========= +Build: 1.16.1-32.0.57 - Mon Jul 06 21:32:33 GMT 2020 + JDLogic: + Add simple patch checker and cleanup patches (#6851) + + * Add simple patch checker and cleanup patches + + * Address comments + * move task implementation + * genPatches is now finalized by checkPatches + * the S2S artifacts are automatically removed + * added class and method access checking + +========= +Build: 1.16.1-32.0.56 - Mon Jul 06 21:27:02 GMT 2020 + richard: + Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 (#6902) + +========= +Build: 1.16.1-32.0.55 - Mon Jul 06 21:12:45 GMT 2020 + richard: + Fix harvest level and tool type not actually getting set #6906 (#6922) + +========= +Build: 1.16.1-32.0.54 - Mon Jul 06 20:46:01 GMT 2020 + richard: + Reimplement ITeleporter Patches (#6886) + +========= +Build: 1.16.1-32.0.53 - Mon Jul 06 20:39:37 GMT 2020 + 40738104+Mysterious-Dev: + Add function to add items with the same behavior as the pumpkin for enderman (#6890) + +========= +Build: 1.16.1-32.0.52 - Mon Jul 06 20:33:17 GMT 2020 + richard: + Custom Item integration with Piglins (#6914) + +========= +Build: 1.16.1-32.0.51 - Mon Jul 06 20:20:02 GMT 2020 + ichttt: + Some dead code cleanup, and re-implement some bed hooks. (#6903) + +========= +Build: 1.16.1-32.0.50 - Mon Jul 06 20:06:39 GMT 2020 + diesieben07: + Fix missing null checks in ForgeIngameGui (#6907) + +========= +Build: 1.16.1-32.0.49 - Mon Jul 06 19:50:02 GMT 2020 + sciwhiz12: + Fix swap offhand keybind not working in GUIs (#6920) + +========= +Build: 1.16.1-32.0.48 - Mon Jul 06 19:42:07 GMT 2020 + thpetuaudletang: + New AddReloadListenerEvent that gathers server side data reload handlers. (#6849) + +========= +Build: 1.16.1-32.0.47 - Fri Jul 03 12:40:42 GMT 2020 + David Quintana: + Attempt to use a more compatible method to initialize stencil support. + In case the separate attachments don't work for everyone, there's a new setting to choose the combined attachment. + +========= +Build: 1.16.1-32.0.46 - Fri Jul 03 04:00:22 GMT 2020 + David Quintana: + Update copyright year to 2020. + + David Quintana: + Fix multi-layer item rendering. + +========= +Build: 1.16.1-32.0.44 - Thu Jul 02 17:17:45 GMT 2020 + David Quintana: + Model system improvements: + - Port some things I did in 1.14 which I couldn't do in 1.15 due to breaking changes. + - Fix multi-layer block models not working (1.16 RenderType doesn't override toString the same way anymore) + - Implement multi-layer item rendering. + - Improve CompositeModel submodel data passing. + +========= +Build: 1.16.1-32.0.43 - Thu Jul 02 12:54:03 GMT 2020 + MartijnvandenBrand: + Include model data in getQuads call (#6884) + + The model data wasn't included when getting quads from specific sides, but was when getting quads for side = null. + + thpetuaudletang: + Pass matrixstack in tooltip render events (#6885) + +========= +Build: 1.16.1-32.0.41 - Thu Jul 02 05:54:25 GMT 2020 + tterrag: + Fix improper handling of baked lighting in forge light pipeline + + Closes #6812 + +========= +Build: 1.16.1-32.0.40 - Thu Jul 02 01:59:30 GMT 2020 + richard: + Fix FMLServerAboutToStartEvent being fired too late on the integrated server https://github.com/MinecraftForge/MinecraftForge/issues/6859 + +========= +Build: 1.16.1-32.0.39 - Wed Jul 01 18:14:25 GMT 2020 + ichttt: + Fix miss-aligned patch ItemEntity (#6895) + +========= +Build: 1.16.1-32.0.38 - Tue Jun 30 20:19:32 GMT 2020 + info: + Add hoe tool type (#6872) + +========= +Build: 1.16.1-32.0.36 - Tue Jun 30 20:09:21 GMT 2020 + curle: + Allow any armor to have custom knockback resistance (#6877) + +========= +Build: 1.16.1-32.0.35 - Tue Jun 30 19:57:32 GMT 2020 + diesieben07: + Add senderUUID to ClientChatReceivedEvent (#6881) + +========= +Build: 1.16.1-32.0.34 - Tue Jun 30 02:33:58 GMT 2020 + lex: + Re-write checkATs function and automate making Items/Blocks public. + +========= +Build: 1.16.1-32.0.33 - Tue Jun 30 02:10:14 GMT 2020 + cpw: + Reorganize modloading on the dediserver. This removes the DedicatedServer parameter from the FMLDedicatedServerSetupEvent. + Code for customizing the server instance should be moved to the ServerAboutToStartEvent or similar, where the server instance + is available. + + This reorganization means that mods will load fully before the server is even constructed, or the server properties loaded. We also move the EULA right to the front so we don't have to wait for bootstrap. + + This should fix the problems with mods which customize world data and other things. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.32 - Mon Jun 29 23:43:01 GMT 2020 + thpetuaudletang: + Fix datagen resolving tags and exploding. (#6865) + +========= +Build: 1.16.1-32.0.31 - Mon Jun 29 23:37:30 GMT 2020 + mattmess1221: + Fix Language.javaLocale parsing (#6862) + +========= +Build: 1.16.1-32.0.30 - Mon Jun 29 22:58:30 GMT 2020 + diesieben07: + Fix IItemHandler wrappers for chests not updating both chests (#6875) + +========= +Build: 1.16.1-32.0.29 - Mon Jun 29 21:08:55 GMT 2020 + lex: + Fix missed patch in PlayerList and EntitySelectioonContext. Closes #6846 Closes #6850 + +========= +Build: 1.16.1-32.0.27 - Mon Jun 29 20:09:12 GMT 2020 + richard: + Fix access levels being hardcoded to private via patch overriding AT entry (#6848) + +========= +Build: 1.16.1-32.0.26 - Mon Jun 29 19:42:50 GMT 2020 + lex: + Fix tag related issues when connecting to a vanilla server. + +========= +Build: 1.16.1-32.0.25 - Sun Jun 28 22:08:15 GMT 2020 + lex: + Fix Forge's internal handler being registered in wrong place. + Fix double call to loader end. + +========= +Build: 1.16.1-32.0.24 - Sat Jun 27 22:50:54 GMT 2020 + David Quintana: + Add a model loader that lets mods specify different models for different perspectives. + Allow custom models to reference vanilla item models as child models. + +========= +Build: 1.16.1-32.0.23 - Fri Jun 26 23:55:23 GMT 2020 + thpetuaudletang: + fix misapplied patch + + also sneak in an import patch removal + +========= +Build: 1.16.1-32.0.21 - Fri Jun 26 22:40:19 GMT 2020 + lex: + Fix blocks being harvested with incorrect tools. + +========= +Build: 1.16.1-32.0.20 - Fri Jun 26 19:53:02 GMT 2020 + lex: + Make installer use MCPConfig version to identify MC assets. + +========= +Build: 1.16.1-32.0.19 - Fri Jun 26 18:27:49 GMT 2020 + cpw: + Tweak the server startup a bit, make sure methods that can't work because they run before a server exists explode saying so. + Also fix other launch profiles. + + Signed-off-by: cpw + +========= +Build: 1.16.1-32.0.18 - Fri Jun 26 16:56:37 GMT 2020 + lex: + Fix dedicated server loading by constructing mods before data packs are created. + +========= +Build: 1.16.1-32.0.17 - Fri Jun 26 15:20:37 GMT 2020 + David Quintana: + Fix create method. + Fix test mods not loading correctly. + +========= +Build: 1.16.1-32.0.16 - Fri Jun 26 14:43:19 GMT 2020 + David Quintana: + Reintroduce missed patch in EntityClassification. + +========= +Build: 1.16.1-32.0.15 - Fri Jun 26 13:55:42 GMT 2020 + thpetuaudletang: + Include a getter for the matrix stack in OverlayEvent (#6834) + +========= +Build: 1.16.1-32.0.14 - Fri Jun 26 13:23:07 GMT 2020 + thpetuaudletang: + Fix block render types not being properly applied to item entities (#6832) + +========= +Build: 1.16.1-32.0.13 - Fri Jun 26 13:05:18 GMT 2020 + mods.itsmeow: + [1.16.x] Allow GlobalEntityTypeAttributes' EntityType -> AttributeModifierMap to be added to (#6822) + + * Make GlobalEntityTypeAttributes map able to be added to + + * Split get patch into two lines + + * Favor Forge's map over vanilla + +========= +Build: 1.16.1-32.0.12 - Fri Jun 26 12:59:19 GMT 2020 + thpetuaudletang: + Fixed creative screen arrows (#6827) + + Yunus1903: + Added call to method for tooltip with FontRenderer (#6831) + +========= +Build: 1.16.1-32.0.10 - Fri Jun 26 12:36:59 GMT 2020 + curle: + Retarget Block.Properties patch to the new AbstractBlock, reintroduce harvestLevel and harvestTool fields (#6819) + + * Retarget Block.Properties patch to the new AbstractBlock, reintroduces the harvestLevel and harvestTool fields. + + * Slight adjustment to fix the lootTableSupplier. + +========= +Build: 1.16.1-32.0.9 - Fri Jun 26 12:31:37 GMT 2020 + Yunus1903: + Fixed sneaking while swimming (#6817) + +========= +Build: - Fri Jun 26 12:25:07 GMT 2020 + thpetuaudletang: + Fixed tooltip rendering issues (#6815) + +========= +Build: 1.16.1-32.0.7 - Fri Jun 26 02:30:54 GMT 2020 + thpetuaudletang: + Fixed villager trades having non-applicable enchants + + Also added an AT at lex's request + +========= +Build: 1.16.1-32.0.6 - Fri Jun 26 01:52:19 GMT 2020 + thpetuaudletang: + Fix locate command (#6811) + + thpetuaudletang: + Fix block drops (#6810) + + contact: + Add missing patch to ScreenShotHelper (#6809) + + Adds the missed patch back + + Yunus1903: + Updated MDK mods.toml versions (#6808) + + thpetuaudletang: + Fix locate command (#6811) + + thpetuaudletang: + Fix block drops (#6810) + + contact: + Add missing patch to ScreenShotHelper (#6809) + + Adds the missed patch back + + Yunus1903: + Updated MDK mods.toml versions (#6808) + + thpetuaudletang: + Fix locate command (#6811) + + thpetuaudletang: + Fix block drops (#6810) + + contact: + Add missing patch to ScreenShotHelper (#6809) + + Adds the missed patch back + + Yunus1903: + Updated MDK mods.toml versions (#6808) + +========= +Build: 1.16.1-32.0.2 - Fri Jun 26 01:41:51 GMT 2020 + lex: + Rework BlockSnapshot and fix client notifications. Closes #6807 + +========= +Build: 1.16.1-32.0.1 - Thu Jun 25 23:24:48 GMT 2020 + lex: + Bump MCPConfig version. diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..878bf1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1d5b29f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/httpclient-4.5.jar b/libs/httpclient-4.5.jar new file mode 100644 index 0000000..970c989 Binary files /dev/null and b/libs/httpclient-4.5.jar differ diff --git a/logs/debug.log b/logs/debug.log new file mode 100644 index 0000000..e69de29 diff --git a/logs/latest.log b/logs/latest.log new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/dev/garrettmills/csx/matterlinkreboot/IncomingMessage.java b/src/main/java/dev/garrettmills/csx/matterlinkreboot/IncomingMessage.java new file mode 100644 index 0000000..3113dd0 --- /dev/null +++ b/src/main/java/dev/garrettmills/csx/matterlinkreboot/IncomingMessage.java @@ -0,0 +1,53 @@ +package dev.garrettmills.csx.matterlinkreboot; + +import com.google.gson.Gson; + +public class IncomingMessage { + private String text; + private String username; + private String id; + + public static IncomingMessage[] fromStringArray(String jsonString) { + Gson gson = new Gson(); + return gson.fromJson(jsonString, IncomingMessage[].class); + } + + public static IncomingMessage fromString(String jsonString) { + Gson gson = new Gson(); + return gson.fromJson(jsonString, IncomingMessage.class); + } + + public String toJSON() { + Gson gson = new Gson(); + return gson.toJson(this); + } + + public void setText(String value) { + this.text = value; + } + + public String getText() { + return this.text; + } + + public void setUsername(String value) { + this.username = value; + } + + public String getUsername() { + return this.username; + } + + public void setId(String value) { + this.id = value; + } + + public String getId() { + return this.id; + } + + @Override + public String toString() { + return "IncomingMessage"; + } +} diff --git a/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterbridgeAPIClient.java b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterbridgeAPIClient.java new file mode 100644 index 0000000..69f0d2d --- /dev/null +++ b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterbridgeAPIClient.java @@ -0,0 +1,68 @@ +package dev.garrettmills.csx.matterlinkreboot; + +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; + +public class MatterbridgeAPIClient { + + // Directly reference a log4j logger. + private static final Logger LOGGER = LogManager.getLogger(MatterlinkReboot.MOD_ID); + + private static final CloseableHttpClient http = HttpClients.createDefault(); + + public static final IncomingMessage[] NO_MESSAGES = {}; + + public static void close() throws IOException { + http.close(); + } + + public static IncomingMessage[] getMessages() { + String url = MatterbridgeAPIClient.buildURL("messages"); + + HttpGet req = new HttpGet(url); + + try { + CloseableHttpResponse res = http.execute(req); + HttpEntity body = res.getEntity(); + + if ( body != null ) { + String result = EntityUtils.toString(body); + return IncomingMessage.fromStringArray(result); + } + } catch (Exception e) { + LOGGER.error(e); + } + + return NO_MESSAGES; + } + + public static void sendMessage(OutgoingMessage message) { + try { + HttpPost post = new HttpPost(buildURL("message")); + StringEntity body = new StringEntity(message.toJSON()); + + post.setHeader("Content-Type", "application/json"); + post.setEntity(body); + + http.execute(post); + } catch (Exception e) { + LOGGER.error(e); + } + } + + public static String buildURL(String endpoint) { + return MatterlinkRebootConfig.GENERAL.BridgeProtocol.get() + "://" + + MatterlinkRebootConfig.GENERAL.BridgeHost.get() + ":" + MatterlinkRebootConfig.GENERAL.BridgePort.get() + + "/api/" + endpoint; + } +} diff --git a/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkReboot.java b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkReboot.java new file mode 100644 index 0000000..4867a2a --- /dev/null +++ b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkReboot.java @@ -0,0 +1,80 @@ +package dev.garrettmills.csx.matterlinkreboot; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; +import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Timer; +import java.util.TimerTask; + +// The value here should match an entry in the META-INF/mods.toml file +@Mod("matterlinkreboot") +public class MatterlinkReboot +{ + public static final String MOD_ID = "matterlinkreboot"; + + // Directly reference a log4j logger. + private static final Logger LOGGER = LogManager.getLogger(MatterlinkReboot.MOD_ID); + + private final TimerTask task = new MatterlinkRebootTask(); + private final Timer timer = new Timer(true); + + public MatterlinkReboot() { + // Register the setup method for modloading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + + ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, MatterlinkRebootConfig.spec); + + // Register ourselves for server and other game events we are interested in + MinecraftForge.EVENT_BUS.register(this); + } + + private void setup(final FMLCommonSetupEvent event) { + LOGGER.info("Bridge enabled? " + this.isEnabled()); + LOGGER.info("Bridge API: " + MatterlinkRebootConfig.GENERAL.BridgeHost.get() + ":" + MatterlinkRebootConfig.GENERAL.BridgePort.get()); + } + + @SubscribeEvent + public void onServerStarting(FMLServerStartingEvent event) { + if ( this.isEnabled() ) { + LOGGER.info("Scheduling background task!"); + LOGGER.info("Polling interval: " + MatterlinkRebootConfig.GENERAL.PollingInterval.get() + " seconds"); + this.timer.scheduleAtFixedRate(this.task, 0, MatterlinkRebootConfig.GENERAL.PollingInterval.get() * 1000); + } + } + + @SubscribeEvent + public void onServerStopping(final FMLServerStoppingEvent event) { + if ( this.isEnabled() ) { + LOGGER.info("Stopping background task!"); + this.timer.cancel(); + } + } + + @SubscribeEvent + public void onServerChat(ServerChatEvent event) { + if ( this.isEnabled() ) { + OutgoingMessage msg = new OutgoingMessage(); + + msg.setUsername(event.getUsername()); + msg.setText(event.getMessage()); + msg.setAvatar(MatterlinkRebootConfig.GENERAL.DefaultAvatar.get()); + msg.setGateway(MatterlinkRebootConfig.GENERAL.BridgeGateway.get()); + + MatterbridgeAPIClient.sendMessage(msg); + } + } + + public boolean isEnabled() { + return MatterlinkRebootConfig.GENERAL.BridgeEnabled.get(); + } +} diff --git a/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkRebootConfig.java b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkRebootConfig.java new file mode 100644 index 0000000..4cf9caa --- /dev/null +++ b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkRebootConfig.java @@ -0,0 +1,46 @@ +package dev.garrettmills.csx.matterlinkreboot; + +import net.minecraftforge.common.ForgeConfigSpec; + +public class MatterlinkRebootConfig { + private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); + public static final General GENERAL = new General(BUILDER); + public static final ForgeConfigSpec spec = BUILDER.build(); + + public static class General { + public final ForgeConfigSpec.ConfigValue BridgeEnabled; + public final ForgeConfigSpec.ConfigValue BridgeHost; + public final ForgeConfigSpec.ConfigValue BridgePort; + public final ForgeConfigSpec.ConfigValue BridgeProtocol; + public final ForgeConfigSpec.ConfigValue BridgeGateway; + public final ForgeConfigSpec.ConfigValue DefaultAvatar; + public final ForgeConfigSpec.ConfigValue PollingInterval; + + public General(ForgeConfigSpec.Builder builder) { + builder.push("General"); + + BridgeEnabled = builder.comment("Enables/disables the chat entire chat bridge. (true, false) [true]") + .define("bridgeEnabled", false); + + BridgeHost = builder.comment("Hostname or IP address of the Matterbridge server. [127.0.0.1]") + .define("bridgeHost", "127.0.0.1"); + + BridgePort = builder.comment("Port of the Matterbridge server on the host. [4242]") + .define("bridgePort", 4242); + + BridgeProtocol = builder.comment("Protocol to use to interact with the Matterbridge API. (http, https) [http]") + .define("bridgeProtocol", "http"); + + BridgeGateway = builder.comment("Name of the Matterbridge gateway to push messages to. [matterbridge]") + .define("bridgeGateway", "gateway"); + + DefaultAvatar = builder.comment("Default URL to use for the avatar for outgoing messages. [https://secure.gravatar.com/avatar/matterlinkreboot.jpg]") + .define("defaultAvatar", "https://secure.gravatar.com/avatar/matterlinkreboot.jpg"); + + PollingInterval = builder.comment("Interval (in seconds) to poll the Matterbridge server to check for new messages. [2]") + .define("pollingInterval", 2); + + builder.pop(); + } + } +} diff --git a/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkRebootTask.java b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkRebootTask.java new file mode 100644 index 0000000..982f12e --- /dev/null +++ b/src/main/java/dev/garrettmills/csx/matterlinkreboot/MatterlinkRebootTask.java @@ -0,0 +1,38 @@ +package dev.garrettmills.csx.matterlinkreboot; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.util.text.StringTextComponent; +import net.minecraft.world.server.ServerWorld; +import net.minecraftforge.fml.server.ServerLifecycleHooks; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.TimerTask; +import java.util.UUID; + +public class MatterlinkRebootTask extends TimerTask { + + // Directly reference a log4j logger. + private static final Logger LOGGER = LogManager.getLogger(MatterlinkReboot.MOD_ID); + + @Override + public void run() { + IncomingMessage[] messages = MatterbridgeAPIClient.getMessages(); + + for ( IncomingMessage msg : messages ) { + this.postChatToGame(msg.getUsername(), msg.getText()); + } + } + + /** + * Posts a chat message to all players in the server. + * @param username Username of the user who sent the message + * @param message Message to be displayed + */ + public void postChatToGame(String username, String message) { + for (ServerPlayerEntity playerEntity : ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayers()) { + playerEntity.sendMessage(new StringTextComponent("<" + username + "> " + message), UUID.randomUUID()); + } + } +} diff --git a/src/main/java/dev/garrettmills/csx/matterlinkreboot/OutgoingMessage.java b/src/main/java/dev/garrettmills/csx/matterlinkreboot/OutgoingMessage.java new file mode 100644 index 0000000..37cfa05 --- /dev/null +++ b/src/main/java/dev/garrettmills/csx/matterlinkreboot/OutgoingMessage.java @@ -0,0 +1,56 @@ +package dev.garrettmills.csx.matterlinkreboot; + +import com.google.gson.Gson; + +public class OutgoingMessage { + private String avatar; + private String event = ""; + private String gateway; + private String text; + private String username; + + public String toJSON() { + Gson gson = new Gson(); + return gson.toJson(this); + } + + public void setAvatar(String value) { + this.avatar = value; + } + + public String getAvatar() { + return this.avatar; + } + + public void setEvent(String value) { + this.event = value; + } + + public String getEvent() { + return this.event; + } + + public void setGateway(String value) { + this.gateway = value; + } + + public String getGateway() { + return this.gateway; + } + + public void setText(String value) { + this.text = value; + } + + public String getText() { + return this.text; + } + + public void setUsername(String value) { + this.username = value; + } + + public String getUsername() { + return this.username; + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..9883316 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,56 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="[35,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="MIT" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="matterlinkreboot" #mandatory +# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it +# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata +# see the associated build.gradle script for how to populate this completely automatically during a build +version="${file.jarVersion}" #mandatory + # A display name for the mod +displayName="Matterlink: Reboot" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +# credits="Thanks for this example mod goes to Java" #optional +# A text field displayed in the mod UI +authors="Cestaberous" #optional +# The description text for the mod (multi line!) (#mandatory) +description=''' +Matterlink was a 1.10.x mod that provided Matterbridge integration with Minecraft. Matterlink: Reboot is the 1.16+ version of that mod. + +MR allows connecting your Minecraft server to a Matterbridge relay so that messages can be shared between many different chat platforms as if they were one. + +Ever wanted your server chat to integrate with a Discord channel? A Slack channel? An IRC channel? Well, this mod can help you do that. + +Matterlink: Reboot is not affiliated in any way with Matterlink or its author(s). +''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.matterlinkreboot]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="[35,)" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory + ordering="NONE" + # Side this dependency is applied on - BOTH, CLIENT or SERVER + side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..c79a362 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,7 @@ +{ + "pack": { + "description": "examplemod resources", + "pack_format": 6, + "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." + } +}