diff --git a/1.19.2/.gitattributes b/1.19.2/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/1.19.2/.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/1.19.2/.gitignore b/1.19.2/.gitignore new file mode 100644 index 0000000..12f8644 --- /dev/null +++ b/1.19.2/.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/1.19.2/CREDITS.txt b/1.19.2/CREDITS.txt new file mode 100644 index 0000000..a70c53d --- /dev/null +++ b/1.19.2/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/1.19.2/LICENSE.txt b/1.19.2/LICENSE.txt new file mode 100644 index 0000000..b0cbe2b --- /dev/null +++ b/1.19.2/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/1.19.2/README.txt b/1.19.2/README.txt new file mode 100644 index 0000000..abcc8ce --- /dev/null +++ b/1.19.2/README.txt @@ -0,0 +1,46 @@ + +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 "un-renamed" MCP source code (aka +SRG Names) - this means that you will not be able to read them directly against +normal code. + +Setup Process: +============================== + +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` +2. Open Eclipse, Import > Existing Gradle Project > Select Folder + or run `gradlew eclipse` to generate the project. + +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` +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 process again. + +Mapping Names: +============================= +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license, if you do not agree with it you can change your mapping names to other crowdsourced names in your +build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + +Additional Resources: +========================= +Community Documentation: https://docs.minecraftforge.net/en/1.19.2/gettingstarted/ +LexManos' Install Video: https://youtu.be/8VEdtQLuLO0 +Forge Forums: https://forums.minecraftforge.net/ +Forge Discord: https://discord.minecraftforge.net/ diff --git a/1.19.2/build.gradle b/1.19.2/build.gradle new file mode 100644 index 0000000..8139547 --- /dev/null +++ b/1.19.2/build.gradle @@ -0,0 +1,207 @@ +plugins { + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' +} + +version = mod_version +group = mod_group_id + +base { + archivesName = mod_id +} + +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +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. + // Channel: Version: + // official MCVersion Official field/method names from Mojang mapping files + // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official + // + // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. + // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + // + // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge + // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started + // + // 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: mapping_channel, version: mapping_version + + // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. + // In most cases, it is not necessary to enable. + // enableEclipsePrepareRuns = true + // enableIdeaPrepareRuns = true + + // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. + // It is REQUIRED to be set to true for this template to function. + // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html + copyIdeResources = true + + // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. + // The folder name can be set on a run configuration using the "folderName" property. + // By default, the folder name of a run configuration is the name of the Gradle project containing it. + // generateRunFolders = true + + // This property enables access transformers for use in development. + // They will be applied to the Minecraft artifact. + // The access transformer file can be anywhere in the project. + // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. + // This default location is a best practice to automatically put the file in the right place in the final jar. + // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + // applies to all the run configs below + configureEach { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + } + + server { + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + property 'forge.enabledGameTestNamespaces', mod_id + } + + data { + // example of overriding the workingDirectory set in configureEach above + workingDirectory project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + // Put repositories for dependencies here + // ForgeGradle automatically adds the Forge maven and Maven Central for you + + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: + // flatDir { + // dir 'libs' + // } +} + +dependencies { + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by ForgeGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + + // Real mod deobf dependency examples - these get remapped to your current mappings + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency + // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description, + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } +} + +// Example for how to get properties into the manifest for reading at runtime. +tasks.named('jar', Jar).configure { + manifest { + attributes([ + 'Specification-Title' : mod_id, + 'Specification-Vendor' : mod_authors, + 'Specification-Version' : '1', // We are version 1 of ourselves + 'Implementation-Title' : project.name, + 'Implementation-Version' : project.jar.archiveVersion, + 'Implementation-Vendor' : mod_authors, + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } + + // This is the preferred method to reobfuscate your jar file + 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: +// tasks.named('publish').configure { +// dependsOn 'reobfJar' +// } + +publishing { + publications { + register('mavenJava', MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://${project.projectDir}/mcmodsrepo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} diff --git a/1.19.2/changelog.txt b/1.19.2/changelog.txt new file mode 100644 index 0000000..b86d681 --- /dev/null +++ b/1.19.2/changelog.txt @@ -0,0 +1,697 @@ +1.19.2 Changelog +43.5 +==== + - 43.5.0 1.19.2 RB 5 + https://forums.minecraftforge.net/topic/154385-forge-435-minecraft-1192/ + +43.4 +==== + - 43.4.23 Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10464) + - 43.4.22 Speed up mod annotation scanning by ~30% (#10472) + Co-authored-by: LexManos + - 43.4.21 Fix continuing to use items after dropping or when a shield breaks (#10382) + Fixes MC-231097 and MC-168573 + Cache this.useItem before running item break logic, Fixes #10344 + - 43.4.20 Add fast graphics render type to block model jsons (#10400) + Make modded leaves behave like vanilla leaves by default (Fixes #10389) + - 43.4.19 Backport even more future ResourceLocation methods (#10430) + - 43.4.18 Ensure NetworkConstants is loaded before mod construction (#10448) + - 43.4.17 Add `clientSideOnly` feature to mods.toml (#10085) (backport of #9804 to 1.20.1) (#10367) + Co-authored-by: Paint_Ninja + - 43.4.16 Fix incorrect method reference in TntBlock.explode() (#10333) + - 43.4.15 Fix issue with shields being disabled by an attacker (#10323) + - 43.4.14 Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10360) + Add VillagerType#registerBiomeType + Co-authored-by: Joseph T. McQuigg + - 43.4.13 Fix non-passengers being tickable without checking canUpdate() (#10306) + - 43.4.12 Bump CoreMods to 5.2.4 (#10269) + - 43.4.11 Allow mipmap lowering to be disabled (#10250) + - 43.4.10 Add optional fix of use item duration, disabled by default (#10244) + - 43.4.9 Backport some Vanilla 1.21 `ResourceLocation` methods (#10239) + Co-authored-by: Paint_Ninja + - 43.4.8 Deprecate `@ObjectHolder`, add a couple of fast-paths (#10226) + Co-authored-by: Paint_Ninja + - 43.4.7 Disable clean on TeamCity (#10260) + - 43.4.6 Bump JNA to 5.12.1 (#10186) + - 43.4.5 Bump CoreMods to 5.2 (#10132) + Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 + The key features are: + - ES6 language support + - Thoroughly updated ASMAPI, with full documentation + - Bug fixes (some optional for backwards-compatibility) + - Partial internal code cleanup + - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default + Related dependency bumps: + - Updated ASM to 9.7.1 + - Updated Nashorn to 15.4 + - Updated Log4J to 2.19.0 (included with installer) + - 43.4.4 Cleanup FML Bindings (backport of #10004 to 1.19.2) (#10105) + - 43.4.3 Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.19.2) (#10106) + Co-authored-by: RealMangoRage + - 43.4.2 Fixed falling block entities not rendering as moving blocks (#10006) (#10020) + Co-authored-by: Ven + - 43.4.1 Choose default JarJar mod file type based on parent JAR (#10025) + Co-authored-by: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> + - 43.4.0 1.19.2 RB 4 + https://forums.minecraftforge.net/topic/149548-forge-434-minecraft-1192/ + +43.3 +==== + - 43.3.14 Update Gradle to 8.8 + - 43.3.13 Fix NPE when acceptableValues in defineInList() does not allow nulls, fixes #9300, backport of #9903 (#9909) + Co-authored-by: J-RAP + - 43.3.12 Optimise capabilities a tad, backport of #9886 (#9918) + - 43.3.11 Make common config screen registration tasks easier, backport of #9884 (#9914) + - 43.3.10 Bump ASM, fix userdev, fix crowdin (#9925) + - 43.3.9 Bump some deps (#9878) + - CoreMods 5.0.1 -> 5.1.2 + - ASM 9.5 -> 9.6 + - Installer 2.1 -> 2.2 + - Installer tools 1.3.0 -> 1.4.1 + - 43.3.8 Fix TagsProvider not honoring replace attribute (#9865) + - 43.3.7 Make common DisplayTest registration tasks easier (#9838) + Backport of #9822 to 1.19.2 + - 43.3.6 Optimise ForgeConfigSpec and make Range public (#9827) + Backport of #9810 to 1.19.2 + - 43.3.5 Update to FG6 and Gradle 8, backport 1.20 MDK (#9754) + - 43.3.4 Improve mod description formatting in mods screen (#9771) + Co-authored-by: Su5eD + - 43.3.3 Backport CrashReportAnalyser to 1.19.2 (#9758) + - 43.3.2 Optimise path filter in mod loading (#9712) + Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com> + - 43.3.1 Improve mod loading error message for errors inside mod constructors (#9709) + Co-authored-by: Jab125 <67534807+jab125@users.noreply.github.com> + - 43.3.0 1.19.2 RB 3 + +43.2 +==== + - 43.2.23 Fix `Level` leak in debug HUD (#9701) + - 43.2.22 Keep order of sources in PackRepository (#9704) + Co-authored-by: dhyces <10985914+dhyces@users.noreply.github.com> + - 43.2.21 Fix parameter names in IForgeDimensionSpecialEffects.adjustLightmapColors to better describe what they are. (#9658) + - 43.2.20 Re-add in-game mod menu (#9655) + - 43.2.19 Fixed FluidUtil#tryFillContainer returning invalid result when simulating (#9358) + - 43.2.18 AlterGroundEvent for modifying block placement performed by AlterGroundDecorator (#9635) + - 43.2.17 Bump ASM to 9.5 (#9516) + - 43.2.16 Improve logging for server connections (#9623) + - 43.2.15 Log a proper duplicate mod(s) error message (#9625) + - 43.2.14 Fix erroneous getLevel call when firing SpecialSpawn (#9520) + - 43.2.13 [1.19.2] Fix the rest of the spawn event calls (#9482) + - 43.2.12 Loosen access for BucketItem's canBlockContainFluid (#9429) + - 43.2.11 Fix event result being ignored (#9484) + Co-authored-by: Brennan Ward <3682588+Shadows-of-Fire@users.noreply.github.com> + - 43.2.10 Fix incorrect SpecialSpawn fire location (#9480) + Co-authored-by: Brennan Ward <3682588+Shadows-of-Fire@users.noreply.github.com> + - 43.2.9 [1.19.2] Fix forge grindstone hooks allowing stacks of non-stackable items (#9466) + - 43.2.8 Fix JSON model root transforms (#9411) + - 43.2.7 Fix StemBlock not checking canSustainPlant for the correct block + It now checks for Melons/Pumpkins instead of the stem itself. + - 43.2.6 Fix of inconsistent vaporization in BucketItem & FluidType (#9340) + - 43.2.5 Backport `ClientChatReceivedEvent.System` for 1.19.2. Fixes #9352 (#9355) + - 43.2.4 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9302) + - 43.2.3 Disable guiLight3d for generated item models (#9231) + - 43.2.2 Fix config key used by resource cache (#9253) + This bring it in line with the config key defined in the spec and + default config file in ResourceManagerBootCacheConfigurationHandler. + Fixes #9252 + - 43.2.1 [1.19.2] Fix compatibility checker task configuration (#9233) + * Fix compatibility checker task configuration + The setupCheckJarCompatibility task exists to configure the main + compatibility checker task, checkJarCompatibility, because certain + configuration steps for that task could not be done until after the + configuration phase of Gradle. + However, that setup task previously held all the configuration for the + main check task in its task action. This caused problems because the + main check task's inputs are linked to other tasks, and the previous + situation made it so its configuration (by the setup task) happened + _after_ Gradle built the task dependency model/tree. + This meant that certain tasks which the main check task depended on did + not run before that task, because Gradle was unaware of this inter-task + dependency until it was too late (when it was already executing tasks). + This fixes the issue by moving the bulk of the configuration for the + main check task from the action of the setup task to the main + buildscript, therefore allowing Gradle to know about those task + dependencies and factor them in to its process of determining what tasks + to run and in what order. + The remaining configuration step in the setup task for the main check + task is linked to the setup task, and does not affect the task's + dependencies (because it uses a configuration which it resolves + immediately), so it stays in the setup task. + * Force checker setup task to never be up-to-date + The setup task configures the main check task, so it should always run + before that task. However, because it has an input and output, the setup + task is affected by Gradle's incremental build feature, which leads to + the possibility that Gradle considers the setup task as up-to-date, + therefore not executing its action and causing errors with the main + check task down the line. + - 43.2.0 43.2 Recommended Build. + +43.1 +==== + - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) + - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) + - 43.1.63 Enable additional build types to handle pull request validation. (#9159) + - 43.1.62 Check source permission level before selector permission (#9147) + In some situations, such as execution of a function by an advancement as + part of its reward, a command source stack may have a backing source of + a ServerPlayer which may lack the entity selector permission and have an + explicit permission level that should allow the use of entity selectors, + through CommandSourceStack#withPermission. + We now check if the permission level of the command source stack is + sufficient for entity selectors _before_ checking if the source is a + player and if they have the requisite permission. + This means that an operator permission level of 2 will always override + the Forge entity selector permission. + Fixes #9137 + - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) + - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) + - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) + - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) + - 43.1.57 Make Util.memoize thread-safe (#9155) + - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) + - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) + - 43.1.54 Add simple block appearance API (#9066) + - 43.1.53 Fix invalidated modded packets when on LAN (#9157) + - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) + - 43.1.51 Fix launch handler minecraft classpath locator (#9120) + - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) + - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) + This means that exceptions occurring during the dispatch of the registry + events, such as those from the suppliers of RegistryObjects, properly + cause a crash rather than merely being logged and allowing the game to + reach the main menu. + Fixes #8720 + - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. + - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) + - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) + - 43.1.45 Remove structures slave map to Feature registry (#9091) + - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) + - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) + - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) + - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) + - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) + - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) + - 43.1.38 Rename fluid type milk translation keys (#9077) + - 43.1.37 Fix minecart speed with water (#9076) + - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) + - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) + - 43.1.34 Fix NPE when feeding wolves and cats (#9074) + - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) + - 43.1.32 Fix ServiceLoader bug + - 43.1.31 Fix ClientChatReceivedEvent for system messages + - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) + - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) + - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) + - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) + - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) + - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 + Add IS_CAVE tag Closes #8885 + Add IS_DESERT tag Closes #8979 + Simplify Mangrove Swamp tags Closes #8980 + - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) + - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) + - 43.1.22 Update fence_gates/wooden (#8936) + - 43.1.21 [1.19.x] Added event for growing fungus (#8981) + - 43.1.20 Added Bookshelves block tag (#8991) + - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) + - 43.1.18 Allow mods to specify shader import namespace (#9021) + - 43.1.17 Grindstone Events (#8934) + One to modify the output, and one to modify the input. + - 43.1.16 Fix the serialized names of the enum (#9014) + - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) + - 43.1.14 Add mod mismatch event (#8989) + - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) + - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) + - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) + Co-authored-by: LexManos + - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) + - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) + Co-authored-by: sciwhiz12 + - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) + - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) + - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) + - 43.1.5 fix misplaced patch in sapling block (#9005) + - 43.1.4 Fix failed entity interactions consuming the click. (#9007) + - 43.1.3 Fix entity selector permission check to check original source (#8995) + Permission checks should be against the command source and not the + target entity, as is done in vanilla. + Fixes #8994 + - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) + * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error + - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) + - 43.1.0 1.19.2 RB + +43.0 +==== + - 43.0.22 Added ItemDecorator API (#8794) + - 43.0.21 [1.19.x] Custom usage animations for items (#8932) + - 43.0.20 Allow registering custom `ColorResolver`s (#8880) + - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) + - 43.0.18 Redirect checks for entity selector use to a permission (#8947) + This allows greater flexibility for configuring servers with + operator-like permissions to user groups through the permissions API and + their permissions handler of choice without needing to grant the + vanilla operator permission to any player. + The new permission is "forge:use_entity_selectors", which is granted by + default to players with permission level 2 (GAMEMASTERS) and above. + The hook falls back to checking the permission level if the source of + the command is not a ServerPlayer, such as for command blocks and + functions. + - 43.0.17 Allow FakePlayer to report its position (#8963) + - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) + - 43.0.15 Add cancellable ToastAddEvent (#8952) + - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) + - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) + - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) + Make vanilla custom packets able to be sent multiple times. Closes #8969 + - 43.0.11 Filter name spaces to directories only. Closes #8413 + - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) + - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 + - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) + - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) + - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) + - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) + - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) + - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) + - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) + - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 + - 43.0.0 1.19.2 + +42.0 +==== + - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) + - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) + - 42.0.7 Add Biomes.BEACH to Tags (#8892) + - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) + - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) + - 42.0.4 Re-add PotentialSpawns event (#8712) + - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) + - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) + - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) + - 42.0.0 Forge 1.19.1 + Load natives from classpath + Make command argument types a forge registry + Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` + Overhaul `ServerChatEvent` to use `ChatDecorator` system + Remove `ClientChatEvent#setMessage` for now + Gradle 7.5 + +41.1 +==== + - 41.1.0 Mark 1.19 RB + +41.0 +==== + - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) + - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) + - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 + - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) + - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) + - 41.0.108 Fix Forge's packet handling on play messages. (#8875) + - 41.0.107 Add API for tab list header/footer (#8803) + - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) + - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) + Fix weighted baked models not respecting children render types + Allow fluid container model to use base texture as particle + Fix inverted behavior in composite model building. Fixes #8871 + - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) + - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) + Format: Java-http-client/ MinecraftForge/ / + - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) + - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) + - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing + - 41.0.99 add event to SugarCaneBlock (#8877) + - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) + - 41.0.97 Allow block render types to be set in datagen (#8852) + - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) + - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) + * Add getter for the component names in an unbaked geometry + * Fix render type hint not being copied in BlockGeometryBakingContext + * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer + - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) + See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 + - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 + - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 + - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) + - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) + * Make cutout mipmaps explicitly opt-in for item/entity rendering + * Default render type domain to "minecraft" in model datagens + - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) + - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) + - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) + * Add client-side command line argument to disable DFU optimizations. + * Switch to using FMLConfig value instead. + - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) + * Fixes BufferBuilder.putBulkData(ByteBuffer) + * use nextElementByte + * Fixed merge conflict + - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) + * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. + * Switch to using Or and add comment. + * Switch Or to And. + - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) + * Ported RenderLevelStageEvent from 1.18.2 + * Updated to fix merge conflicts + - 41.0.83 [1.19.x] Fix door datagenerator (#8821) + * Fix door datagenerator + Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. + * Fix extra space around parameter + Fix extra space before comma around a parameter. + - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) + - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) + - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) + * dimension specific tag fix + * remove forge:is_beach cause vanilla has it already + * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) + Co-authored-by: Flemmli97 + - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) + * convert GLM serializer class to codec + * cleanup + * GLM list needs to be sorted + * datagen + * simplify serialization + * fix test mods (oops) + * properly use suppliers for codec as they are registry obj + - 41.0.78 Implement item hooks for potions and enchantments (#8718) + * Implement item hooks for potions and enchantments + * code style fixes + - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) + - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) + * Double Bar Rendering fixed (#8806) + * Added requested changes by sciwhiz12 + - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) + * Add an easy way to get the NamedGuiOverlay from a vanilla overlay + * Fix static member ordering crash in UnitTextureAtlasSprite + * Allow boss bar rendering to be cancelled + * Make fluid container datagen use the new name + - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) + - 41.0.73 Provide additional context to the getFieldOfView event (#8830) + - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) + - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) + * Add a classpath transformer discoverer to load custom transformation services from the classpath + * Update ClasspathTransformerDiscoverer to 1.18 + * Update license year + * Update license header + * Fix the other license headers + * Update ClasspathTransformerDiscoverer to 1.19 + - 41.0.70 Handle modded packets on the network thread (#8703) + * Handle modded packets on the network thread + - On the server we simply need to remove the call to + ensureRunningOnSameThread. + - On the client side, we now handle the packet at the very start of the + call. We make sure we're running from a network thread to prevent + calling the handling code twice. + While this does mean we no longer call .release(), in practice this + doesn't cause any leaks as ClientboundCustomPayloadPacket releases + for us. + * Clarify behaviour a little in the documentation + * Javadoc formatting + * Add a helper method for handling packets on the main thread + Also rename the network thread one. Should make it clearer the expected + behaviour of the two, and make it clearer there's a potentially breaking + change. + * Add back consumer() methods + Also document EventNetworkChannel, to clarify the thread behaviour + there. + * Add since = "1.19" to deprecated annotations + - 41.0.69 Cache resource listing calls in resource packs (#8829) + * Make the resource lookups cached. + * Include configurability and handle patch cleanup. + * Document and comment the cache manager. + * Make thread selection configurable. + * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. + * Use boolean supplier and fix wildcard import. + * Clean up the VPR since this is more elegant. + * Clean up the VPR since this is more elegant. + * Address review comments. + * Address more review comments. + * Fix formatting on `getSource` + * Address comments by ichtt + * Adapt to pups requests. + * Stupid idea. + * Attempt this again with a copy on write list. + * Fix a concurrency and loading issue. + * Fix #8813 + Checks if the paths are valid resource paths. + * Move the new methods on vanilla Patch. + - 41.0.68 Update SJH and JIJ + - 41.0.67 Fix #8833 (#8835) + - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) + Yet another blunder we missed during the review of #8786. + - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) + - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) + * Revert "Allow safely registering RenderType predicates at any time (#8685)" + This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. + * Renderable API refactors + - Rename "render values" to "context" + - Rename SimpleRenderable to CompositeRenderable to better reflect its use + - Remove IMultipartRenderValues since it doesn't have any real use + - Add extensive customization options to BakedModelRenderable + * ClientRegistry and MinecraftForgeClient refactors + - Add sprite loader manager and registration event + - Add spectator shader manager and registration event + - Add client tooltip factory manager and registration event + - Add recipe book manager and registration event + - Add key mapping registration event + - Remove ClientRegistry, as everything has been moved out of it + - Remove registration methods from MinecraftForgeClient, as they have dedicated events now + * Dimension special effects refactors + - Fold handlers into an extension class and remove public mutable fields + - Add dimension special effects manager and registration event + * HUD overlay refactors + - Rename to IGuiOverlay match vanilla (instead of Ingame) + - Add overlay manager and registration event + - Move vanilla overlays to a standalone enum + * Model loader refactors + - Rename IModelLoader to IGeometryLoader + - Add loader manager and registration event + - Fold all model events into one + - Move registration of additionally loaded models to an event + - Remove ForgeModelBakery and related classes as they served no purpose anymore + * Render properties refactors + - Rename all render properties to client extensions and relocate accordingly + - Move lookups to the respective interfaces + * Model data refactors + - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions + - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once + * GUI and widget refactors + - Move all widgets to the correct package + - Rename GuiUtils and children to match vanilla naming + * New vertex pipeline API + - Move to vanilla's VertexConsumer + - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline + * Lighting pipeline refactors + - Move to dedicated lighting package + - Separate flat and smooth lighters + - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) + * Model geometry API refactors + - Rename IModelGeometry to IUnbakedGeometry + - Rename IModelConfiguration to IGeometryBakingContext + - Rename other elements to match vanilla naming + - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON + - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled + * Make render types a first-class citizen in baked models + - Add named render types (block + entity + fabulous entity) + - Add named render type manager + registration event + - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) + - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads + * General event refactors + - Several renames to either match vanilla or improve clarity + - Relocate client chat event dispatching out of common code + * Forge model type refactors + - Rename SeparatePerspectiveModel to SeparateTransformsModel + - Rename ItemModelMesherForge to ForgeItemModelShaper + - Rename DynamicBucketModel to DynamicFluidContainerModel + - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction + - Extract ElementsModel from model loader registry + - Add EmptyModel (baked, unbaked and loader) + - Refactor CompositeModel to take over ItemMultiLayerBakedModel + - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions + - Move model loader registration to a proper event handler + - Update names of several JSON fields (backwards-compatible) + - Update datagens to match + * Miscellaneous changes and overlapping patches + - Dispatch all new registration events + - Convert ExtendedServerListData to a record + - Add/remove hooks from ForgeHooksClient as necessary + * Update test mods + * Fix VertexConsumerWrapper returning parent instead of itself + * Additional event cleanup pass + As discussed on Discord: + - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation + - Make all events that shouldn't be fired directly into abstract classes with protected constructors + - Another styling pass, just in case (caught some missed classes) + * Add proper deprecation javadocs and de-dupe some vertex consumer code + * Replace sets of chunk render types with a faster BitSet-backed collection + This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user + * Requested changes + - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager + - Allow non-default elements to be passed into VertexConsumer and add support to derived classes + - Move array instantiation out of quad processing in lighting pipeline + - Fix flipped fluid container model + - Set default UV1 to the correct values in the remapping pipeline + - Minor documentation changes + * Add/update EXC entries and fix AT comment + * Add test mod as per Orion's request + * Additional requested changes + * Allow custom model types to request the particle texture to be loaded + * Even more requested changes + * Improve generics in ConcatenatedListView and add missing fallbacks + * Fix fluid render types being bound to the fluid and not its holder + * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty + Additionally, introduce chunk render type checks in ItemBlockRenderTypes + Co-authored-by: Dennis C + - 41.0.63 Implement full support for IPv6 (#8742) + - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) + - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) + - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) + - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) + Now empty tags are considered broken in all states. + - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) + - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) + - 41.0.56 Add item handler capability to chest boats (#8787) + - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) + - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) + - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) + - 41.0.52 Fix default audio device config loading string comparison issue (#8767) + - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) + - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) + - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) + - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) + - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) + - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) + - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced + merge of text2speech since new BSL does it. + - 41.0.44 Merge text2speech libs together so the natives are part of the jar + - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) + - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer + - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) + * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. + * Also preserve order in runAll + * Do better comparator thanks @pupnewfster + * postEvent as well. + - 41.0.40 Update SJH to 2.0.2.. (#8774) + * Update SJH to 2.0.3.. + - 41.0.39 Sanity check the version specified in the mod file (#8749) + * Sanity check the version specified in the mod file to + make sure it's compatible with JPMS standards for + version strings. + Closes #8748 + Requires SPI 6 + - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) + - 41.0.37 Remove ForgeWorldPreset and related code (#8756) + Vanilla has a working replacement. + - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) + This prevents silent issues where a mod gets the value of the setting + before configs are loaded, which means the default value is always + returned. + As there may be situations where the getting the config setting before + configs are loaded is needed, and it is not preferable to hardcode the + default value, the original behavior is made available through #getRaw. + Implements and closes #7716 + * Remove getRaw() method + This is effectively replaced with the expression `spec.isLoaded() ? + configValue.get() : configValue.getDefault()`. + * Remove forceSystemNanoTime config setting + As implemented, it never had any effect as any place where the config + value would be queried happens before the configs are loaded. + - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) + Previously, the suggestions used the string representation of the enum + through Enum#toString, which can differ from the name of the enum as + required by Enum#valueOf, causing invalid suggestions (both in gui and + through the error message). + - 41.0.34 Jar-In-Jar (#8715) + - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) + - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) + - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) + - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) + - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) + - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) + - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) + - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) + - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) + - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) + - 41.0.23 Replace support bot with support action (#8700) + - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) + - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) + - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) + - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) + - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) + - 41.0.17 Only rewrite datagen cache when needed (#8709) + - 41.0.16 Implement a simple feature system for Forge (#8670) + * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. + Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. + * rebase onto 1.19 and add in SPI update + - 41.0.15 displayTest option in mods.toml (#8656) + * displayTest option in mods.toml + * "MATCH_VERSION" (or none) is existing match version string behaviour + * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string + * "IGNORE_ALL_VERSION" accepts anything and sends an empty string + * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. + * Update display test with feedback and added the mods.toml discussion in mdk. + - 41.0.14 Update forgeSPI to v5 (#8696) + - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) + Also fix Lighting pipeline ignoring the overlay coords from the block renderer. + - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) + - 41.0.11 Fix readAdditionalLevelSaveData (#8704) + - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) + - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) + - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) + - 41.0.7 Update MDK for 1.19 changes (#8675) + - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. + - 41.0.5 Update modlauncher to latest (#8691) + - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) + - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) + Custom registries are still fired in alphabetical order, after all vanilla registries. + Move forge's data_serializers registry to forge namespace. + - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) + Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 + - 41.0.1 Fix the Curlie oopsie + - 41.0.0 Forge 1.19 + * Bump pack.mcmeta formats + * 1.19 biome modifiers + * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable + * Add docs and package-info to client extension interfaces package + * Move RenderBlockOverlayEvent hooks to ForgeHooksClient + * Add package-infos to client events package + * Rename SoundLoadEvent to SoundEngineLoadEvent + This reduces confusion from consumers which may think the + name SoundLoadEvent refers to an individual sound being loaded rather + than the sound engine. + * Document and change SoundLoadEvent to fire on mod bus + Previously, it fired on both the mod bus and the Forge bus, which is + confusing for consumers. + * Delete SoundSetupEvent + Looking at its original implementation shows that there isn't an + appropriate place in the new sound code to reinsert the event, and the + place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. + * Perform some cleanup on client events + - Removed nullable annotations from ClientPlayerNetworkEvent + - Renamed #getPartialTicks methods to #getPartialTick, to be consistent + with vanilla's naming of the partial tick + - Cleanup documentation to remove line breaks, use the + spelling 'cancelled' over + 'canceled', and improve docs on existing and + new methods. + * Remove EntityEvent.CanUpdate + Closes MinecraftForge/MinecraftForge#6394 + * Switch to Jetbrains nullability annotations + * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent + * Remove ForgeWorldPresetScreens + * Remove IForgeRegistryEntry + * Remove use of List in FML's CompletableFutures + * Add docs to mod loading stages, stages, and phases + * Gradle 7.4.2 + * Use SLF4J in FMLLoader and other subprojects + * Switch dynamic versions in subprojects to pinned ones + * Switch ForgeRoot and MDK to FG plugin markers + * Configure Forge javadoc task + The task now uses a custom stylesheet with MCForge elements, and + configured to combine the generation from the four FML subprojects + (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project + into the javadoc output. + * Update docs/md files, for 1.19 update and the move away from IRC to Discord. + * Make "Potentially dangerous alternative prefix" a debug warning, not info. + Co-authored-by: Curle + Co-authored-by: sciwhiz12 + diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties new file mode 100644 index 0000000..d3fe6a9 --- /dev/null +++ b/1.19.2/gradle.properties @@ -0,0 +1,23 @@ +# 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 +org.gradle.java.home=C:\\Program Files\\Java\\jdk-17 + +## Environment Properties +minecraft_version=1.19.2 +minecraft_version_range=[1.19.2,1.20) +forge_version=43.5.0 +forge_version_range=[43,) +loader_version_range=[43,) +mapping_channel=official +mapping_version=1.19.2 + +## Mod Properties +mod_id=kofola +mod_name=Kofola Mod +mod_license=MIT +mod_version=1.0.1 +mod_group_id=cz.kofolamod +mod_authors=Dominik +mod_description=Pravá Kofola do Minecraftu 1.19.2! Přidává láhev Kofoly, plechovku, točenou Kofolu, sirup KOFO, přepravku a tekutou Kofolu s kompatibilitou pro Farmer's Delight a Create. diff --git a/1.19.2/gradle/wrapper/gradle-wrapper.jar b/1.19.2/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..c1962a7 Binary files /dev/null and b/1.19.2/gradle/wrapper/gradle-wrapper.jar differ diff --git a/1.19.2/gradle/wrapper/gradle-wrapper.properties b/1.19.2/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2617362 --- /dev/null +++ b/1.19.2/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/1.19.2/gradlew b/1.19.2/gradlew new file mode 100644 index 0000000..aeb74cb --- /dev/null +++ b/1.19.2/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/1.19.2/gradlew.bat b/1.19.2/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/1.19.2/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 execute + +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 + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/1.19.2/settings.gradle b/1.19.2/settings.gradle new file mode 100644 index 0000000..0077fa7 --- /dev/null +++ b/1.19.2/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' +} diff --git a/1.19.2/src/main/java/cz/kofolamod/KofolaMod.java b/1.19.2/src/main/java/cz/kofolamod/KofolaMod.java new file mode 100644 index 0000000..9d7c9af --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/KofolaMod.java @@ -0,0 +1,56 @@ +package cz.kofolamod; + +import cz.kofolamod.recipe.KofolaBrewingRecipe; +import cz.kofolamod.registry.ModBlocks; +import cz.kofolamod.registry.ModFluids; +import cz.kofolamod.registry.ModItems; +import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.client.renderer.RenderType; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.brewing.BrewingRecipeRegistry; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Mod(KofolaMod.MOD_ID) +public class KofolaMod { + public static final String MOD_ID = "kofola"; + public static final Logger LOGGER = LoggerFactory.getLogger(KofolaMod.class); + + public KofolaMod() { + IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + + ModFluids.FLUID_TYPES.register(modEventBus); + ModFluids.FLUIDS.register(modEventBus); + ModBlocks.BLOCKS.register(modEventBus); + ModItems.ITEMS.register(modEventBus); + + modEventBus.addListener(this::commonSetup); + + MinecraftForge.EVENT_BUS.register(this); + LOGGER.info("Kofola Mod (Forge 1.19.2) initialized! Kdyz ji milujes, neni co resit."); + } + + private void commonSetup(final FMLCommonSetupEvent event) { + event.enqueueWork(() -> { + BrewingRecipeRegistry.addRecipe(new KofolaBrewingRecipe()); + LOGGER.info("Kofola brewing recipes registered."); + }); + } + + @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) + public static class ClientModEvents { + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) { + ItemBlockRenderTypes.setRenderLayer(ModFluids.KOFOLA_SOURCE.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(ModFluids.KOFOLA_FLOWING.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.KOFOLA_CRATE.get(), RenderType.cutout()); + } + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/block/KofolaCrateBlock.java b/1.19.2/src/main/java/cz/kofolamod/block/KofolaCrateBlock.java new file mode 100644 index 0000000..8be6bea --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/block/KofolaCrateBlock.java @@ -0,0 +1,33 @@ +package cz.kofolamod.block; + +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.material.Material; +import org.jetbrains.annotations.Nullable; + +public class KofolaCrateBlock extends HorizontalDirectionalBlock { + + public KofolaCrateBlock() { + super(BlockBehaviour.Properties.of(Material.WOOD) + .sound(SoundType.WOOD) + .strength(2.0F, 3.0F)); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); + } + + @Nullable + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(FACING); + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/compat/FarmersDelightCompat.java b/1.19.2/src/main/java/cz/kofolamod/compat/FarmersDelightCompat.java new file mode 100644 index 0000000..19bbdc9 --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/compat/FarmersDelightCompat.java @@ -0,0 +1,34 @@ +package cz.kofolamod.compat; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.registries.ForgeRegistries; + +public class FarmersDelightCompat { + public static final String MOD_ID = "farmersdelight"; + + public static boolean isLoaded() { + return ModList.get().isLoaded(MOD_ID); + } + + public static void applyComfort(LivingEntity entity, int durationTicks) { + if (!isLoaded()) return; + + MobEffect comfortEffect = ForgeRegistries.MOB_EFFECTS.getValue(new ResourceLocation(MOD_ID, "comfort")); + if (comfortEffect != null) { + entity.addEffect(new MobEffectInstance(comfortEffect, durationTicks, 0)); + } + } + + public static void applyNourishment(LivingEntity entity, int durationTicks) { + if (!isLoaded()) return; + + MobEffect nourishmentEffect = ForgeRegistries.MOB_EFFECTS.getValue(new ResourceLocation(MOD_ID, "nourishment")); + if (nourishmentEffect != null) { + entity.addEffect(new MobEffectInstance(nourishmentEffect, durationTicks, 0)); + } + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/fluid/KofolaFluidType.java b/1.19.2/src/main/java/cz/kofolamod/fluid/KofolaFluidType.java new file mode 100644 index 0000000..9f64c10 --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/fluid/KofolaFluidType.java @@ -0,0 +1,48 @@ +package cz.kofolamod.fluid; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvents; +import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; +import net.minecraftforge.common.SoundActions; +import net.minecraftforge.fluids.FluidType; + +import java.util.function.Consumer; + +public class KofolaFluidType extends FluidType { + private final ResourceLocation stillTexture; + private final ResourceLocation flowingTexture; + private final int tintColor; + + public KofolaFluidType(ResourceLocation stillTexture, ResourceLocation flowingTexture, int tintColor) { + super(FluidType.Properties.create() + .descriptionId("fluid_type.kofola.kofola_fluid") + .density(1050) + .viscosity(1100) + .sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL) + .sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY) + .sound(SoundActions.FLUID_VAPORIZE, SoundEvents.FIRE_EXTINGUISH)); + this.stillTexture = stillTexture; + this.flowingTexture = flowingTexture; + this.tintColor = tintColor; + } + + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new IClientFluidTypeExtensions() { + @Override + public ResourceLocation getStillTexture() { + return stillTexture; + } + + @Override + public ResourceLocation getFlowingTexture() { + return flowingTexture; + } + + @Override + public int getTintColor() { + return tintColor; + } + }); + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/item/DraftKofolaItem.java b/1.19.2/src/main/java/cz/kofolamod/item/DraftKofolaItem.java new file mode 100644 index 0000000..b71142f --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/item/DraftKofolaItem.java @@ -0,0 +1,96 @@ +package cz.kofolamod.item; + +import cz.kofolamod.compat.FarmersDelightCompat; +import cz.kofolamod.registry.ModCreativeModeTab; +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class DraftKofolaItem extends Item { + + public DraftKofolaItem() { + super(new Item.Properties() + .tab(ModCreativeModeTab.KOFOLA_TAB) + .tab(CreativeModeTab.TAB_FOOD) + .stacksTo(16) + .craftRemainder(Items.GLASS_BOTTLE) + .food(ModFoods.DRAFT_KOFOLA)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide) { + entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN); + entity.removeEffect(MobEffects.DIG_SLOWDOWN); + + FarmersDelightCompat.applyComfort(entity, 900); + FarmersDelightCompat.applyNourishment(entity, 600); + + if (entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + } + + if (stack.isEmpty()) { + return new ItemStack(Items.GLASS_BOTTLE); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack bottle = new ItemStack(Items.GLASS_BOTTLE); + if (!player.getInventory().add(bottle)) { + player.drop(bottle, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack) { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.draft_kofola.desc").withStyle(ChatFormatting.GOLD, ChatFormatting.ITALIC)); + tooltip.add(Component.translatable("item.kofola.draft_kofola.effect").withStyle(ChatFormatting.AQUA)); + super.appendHoverText(stack, level, tooltip, flag); + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/item/KofoSyrupItem.java b/1.19.2/src/main/java/cz/kofolamod/item/KofoSyrupItem.java new file mode 100644 index 0000000..41d43ae --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/item/KofoSyrupItem.java @@ -0,0 +1,85 @@ +package cz.kofolamod.item; + +import cz.kofolamod.registry.ModCreativeModeTab; +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class KofoSyrupItem extends Item { + + public KofoSyrupItem() { + super(new Item.Properties() + .tab(ModCreativeModeTab.KOFOLA_TAB) + .tab(CreativeModeTab.TAB_FOOD) + .stacksTo(16) + .craftRemainder(Items.GLASS_BOTTLE) + .food(ModFoods.KOFO_SYRUP)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide && entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + + if (stack.isEmpty()) { + return new ItemStack(Items.GLASS_BOTTLE); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack bottle = new ItemStack(Items.GLASS_BOTTLE); + if (!player.getInventory().add(bottle)) { + player.drop(bottle, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack) { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.kofo_syrup.desc").withStyle(ChatFormatting.DARK_GREEN, ChatFormatting.ITALIC)); + super.appendHoverText(stack, level, tooltip, flag); + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/item/KofolaBottleItem.java b/1.19.2/src/main/java/cz/kofolamod/item/KofolaBottleItem.java new file mode 100644 index 0000000..cd7961a --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/item/KofolaBottleItem.java @@ -0,0 +1,95 @@ +package cz.kofolamod.item; + +import cz.kofolamod.compat.FarmersDelightCompat; +import cz.kofolamod.registry.ModCreativeModeTab; +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class KofolaBottleItem extends Item { + + public KofolaBottleItem() { + super(new Item.Properties() + .tab(ModCreativeModeTab.KOFOLA_TAB) + .tab(CreativeModeTab.TAB_FOOD) + .stacksTo(16) + .craftRemainder(Items.GLASS_BOTTLE) + .food(ModFoods.KOFOLA_BOTTLE)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide) { + entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN); + entity.removeEffect(MobEffects.DIG_SLOWDOWN); + + FarmersDelightCompat.applyComfort(entity, 600); + + if (entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + } + + if (stack.isEmpty()) { + return new ItemStack(Items.GLASS_BOTTLE); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack emptyBottle = new ItemStack(Items.GLASS_BOTTLE); + if (!player.getInventory().add(emptyBottle)) { + player.drop(emptyBottle, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack) { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.kofola_bottle.desc").withStyle(ChatFormatting.GOLD, ChatFormatting.ITALIC)); + tooltip.add(Component.translatable("item.kofola.kofola_bottle.effect").withStyle(ChatFormatting.BLUE)); + super.appendHoverText(stack, level, tooltip, flag); + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/item/KofolaCanItem.java b/1.19.2/src/main/java/cz/kofolamod/item/KofolaCanItem.java new file mode 100644 index 0000000..47cafcb --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/item/KofolaCanItem.java @@ -0,0 +1,84 @@ +package cz.kofolamod.item; + +import cz.kofolamod.registry.ModCreativeModeTab; +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class KofolaCanItem extends Item { + + public KofolaCanItem() { + super(new Item.Properties() + .tab(ModCreativeModeTab.KOFOLA_TAB) + .tab(CreativeModeTab.TAB_FOOD) + .stacksTo(16) + .food(ModFoods.KOFOLA_CAN)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide && entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + + if (stack.isEmpty()) { + return new ItemStack(Items.IRON_NUGGET); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack nugget = new ItemStack(Items.IRON_NUGGET); + if (!player.getInventory().add(nugget)) { + player.drop(nugget, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack) { + return 20; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.GENERIC_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.GENERIC_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.kofola_can.desc").withStyle(ChatFormatting.YELLOW, ChatFormatting.ITALIC)); + super.appendHoverText(stack, level, tooltip, flag); + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/recipe/KofolaBrewingRecipe.java b/1.19.2/src/main/java/cz/kofolamod/recipe/KofolaBrewingRecipe.java new file mode 100644 index 0000000..be5d188 --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/recipe/KofolaBrewingRecipe.java @@ -0,0 +1,34 @@ +package cz.kofolamod.recipe; + +import cz.kofolamod.registry.ModItems; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.Potion; +import net.minecraft.world.item.alchemy.PotionUtils; +import net.minecraft.world.item.alchemy.Potions; +import net.minecraftforge.common.brewing.IBrewingRecipe; + +public class KofolaBrewingRecipe implements IBrewingRecipe { + + @Override + public boolean isInput(ItemStack input) { + if (!input.is(Items.POTION)) { + return false; + } + Potion potion = PotionUtils.getPotion(input); + return potion == Potions.WATER || potion == Potions.AWKWARD; + } + + @Override + public boolean isIngredient(ItemStack ingredient) { + return ingredient.is(ModItems.KOFO_SYRUP.get()); + } + + @Override + public ItemStack getOutput(ItemStack input, ItemStack ingredient) { + if (isInput(input) && isIngredient(ingredient)) { + return new ItemStack(ModItems.KOFOLA_BOTTLE.get()); + } + return ItemStack.EMPTY; + } +} diff --git a/1.19.2/src/main/java/cz/kofolamod/registry/ModBlocks.java b/1.19.2/src/main/java/cz/kofolamod/registry/ModBlocks.java new file mode 100644 index 0000000..6a12790 --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/registry/ModBlocks.java @@ -0,0 +1,26 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import cz.kofolamod.block.KofolaCrateBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.Material; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModBlocks { + public static final DeferredRegister BLOCKS = + DeferredRegister.create(ForgeRegistries.BLOCKS, KofolaMod.MOD_ID); + + public static final RegistryObject KOFOLA_CRATE = BLOCKS.register("kofola_crate", + KofolaCrateBlock::new); + + public static final RegistryObject KOFOLA_FLUID_BLOCK = BLOCKS.register("kofola_fluid", + () -> new LiquidBlock(ModFluids.KOFOLA_SOURCE, BlockBehaviour.Properties.of(Material.WATER) + .noCollission() + .strength(100.0F) + .noLootTable())); +} diff --git a/1.19.2/src/main/java/cz/kofolamod/registry/ModCreativeModeTab.java b/1.19.2/src/main/java/cz/kofolamod/registry/ModCreativeModeTab.java new file mode 100644 index 0000000..cad7adc --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/registry/ModCreativeModeTab.java @@ -0,0 +1,13 @@ +package cz.kofolamod.registry; + +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; + +public class ModCreativeModeTab { + public static final CreativeModeTab KOFOLA_TAB = new CreativeModeTab("kofola_tab") { + @Override + public ItemStack makeIcon() { + return new ItemStack(ModItems.KOFOLA_BOTTLE.get()); + } + }; +} diff --git a/1.19.2/src/main/java/cz/kofolamod/registry/ModFluids.java b/1.19.2/src/main/java/cz/kofolamod/registry/ModFluids.java new file mode 100644 index 0000000..568337c --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/registry/ModFluids.java @@ -0,0 +1,39 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import cz.kofolamod.fluid.KofolaFluidType; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.material.FlowingFluid; +import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.fluids.FluidType; +import net.minecraftforge.fluids.ForgeFlowingFluid; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModFluids { + public static final DeferredRegister FLUID_TYPES = + DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, KofolaMod.MOD_ID); + + public static final DeferredRegister FLUIDS = + DeferredRegister.create(ForgeRegistries.FLUIDS, KofolaMod.MOD_ID); + + public static final RegistryObject KOFOLA_FLUID_TYPE = FLUID_TYPES.register("kofola_fluid", + () -> new KofolaFluidType( + new ResourceLocation(KofolaMod.MOD_ID, "block/kofola_still"), + new ResourceLocation(KofolaMod.MOD_ID, "block/kofola_flow"), + 0xFFFFFFFF + )); + + public static final RegistryObject KOFOLA_SOURCE = FLUIDS.register("kofola_fluid", + () -> new ForgeFlowingFluid.Source(ModFluids.KOFOLA_PROPERTIES)); + + public static final RegistryObject KOFOLA_FLOWING = FLUIDS.register("flowing_kofola_fluid", + () -> new ForgeFlowingFluid.Flowing(ModFluids.KOFOLA_PROPERTIES)); + + public static final ForgeFlowingFluid.Properties KOFOLA_PROPERTIES = new ForgeFlowingFluid.Properties( + KOFOLA_FLUID_TYPE, + KOFOLA_SOURCE, + KOFOLA_FLOWING + ).slopeFindDistance(4).levelDecreasePerBlock(1).block(ModBlocks.KOFOLA_FLUID_BLOCK).bucket(ModItems.KOFOLA_BUCKET); +} diff --git a/1.19.2/src/main/java/cz/kofolamod/registry/ModFoods.java b/1.19.2/src/main/java/cz/kofolamod/registry/ModFoods.java new file mode 100644 index 0000000..5fb8df6 --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/registry/ModFoods.java @@ -0,0 +1,40 @@ +package cz.kofolamod.registry; + +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.food.FoodProperties; + +public class ModFoods { + public static final FoodProperties KOFOLA_BOTTLE = new FoodProperties.Builder() + .nutrition(6) + .saturationMod(0.7F) + .alwaysEat() + .effect(() -> new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 600, 0), 1.0F) + .effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 900, 0), 1.0F) + .build(); + + public static final FoodProperties KOFOLA_CAN = new FoodProperties.Builder() + .nutrition(5) + .saturationMod(0.6F) + .alwaysEat() + .effect(() -> new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 500, 0), 1.0F) + .effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 600, 0), 1.0F) + .build(); + + public static final FoodProperties DRAFT_KOFOLA = new FoodProperties.Builder() + .nutrition(8) + .saturationMod(0.8F) + .alwaysEat() + .effect(() -> new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 600, 1), 1.0F) + .effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 900, 1), 1.0F) + .effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 300, 0), 1.0F) + .build(); + + public static final FoodProperties KOFO_SYRUP = new FoodProperties.Builder() + .nutrition(3) + .saturationMod(0.3F) + .alwaysEat() + .effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 1200, 1), 1.0F) + .effect(() -> new MobEffectInstance(MobEffects.CONFUSION, 100, 0), 0.7F) + .build(); +} diff --git a/1.19.2/src/main/java/cz/kofolamod/registry/ModItems.java b/1.19.2/src/main/java/cz/kofolamod/registry/ModItems.java new file mode 100644 index 0000000..8f548ff --- /dev/null +++ b/1.19.2/src/main/java/cz/kofolamod/registry/ModItems.java @@ -0,0 +1,46 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import cz.kofolamod.item.DraftKofolaItem; +import cz.kofolamod.item.KofoSyrupItem; +import cz.kofolamod.item.KofolaBottleItem; +import cz.kofolamod.item.KofolaCanItem; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.BucketItem; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModItems { + public static final DeferredRegister ITEMS = + DeferredRegister.create(ForgeRegistries.ITEMS, KofolaMod.MOD_ID); + + public static final RegistryObject KOFO_SYRUP = ITEMS.register("kofo_syrup", + KofoSyrupItem::new); + + public static final RegistryObject KOFOLA_BOTTLE = ITEMS.register("kofola_bottle", + KofolaBottleItem::new); + + public static final RegistryObject KOFOLA_CAN = ITEMS.register("kofola_can", + KofolaCanItem::new); + + public static final RegistryObject DRAFT_KOFOLA = ITEMS.register("draft_kofola", + DraftKofolaItem::new); + + public static final RegistryObject KOFOLA_BUCKET = ITEMS.register("kofola_bucket", + () -> new BucketItem(ModFluids.KOFOLA_SOURCE, + new Item.Properties() + .tab(ModCreativeModeTab.KOFOLA_TAB) + .tab(CreativeModeTab.TAB_MISC) + .craftRemainder(Items.BUCKET) + .stacksTo(1))); + + public static final RegistryObject KOFOLA_CRATE = ITEMS.register("kofola_crate", + () -> new BlockItem(ModBlocks.KOFOLA_CRATE.get(), + new Item.Properties() + .tab(ModCreativeModeTab.KOFOLA_TAB) + .tab(CreativeModeTab.TAB_DECORATIONS))); +} diff --git a/1.19.2/src/main/resources/META-INF/mods.toml b/1.19.2/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..f162a71 --- /dev/null +++ b/1.19.2/src/main/resources/META-INF/mods.toml @@ -0,0 +1,39 @@ +modLoader="javafml" +loaderVersion="${loader_version_range}" +license="${mod_license}" + +[[mods]] +modId="${mod_id}" +version="${mod_version}" +displayName="${mod_name}" +logoFile="icon.png" +authors="${mod_authors}" +description='''${mod_description}''' + +[[dependencies.${mod_id}]] + modId="forge" + mandatory=true + versionRange="${forge_version_range}" + ordering="NONE" + side="BOTH" + +[[dependencies.${mod_id}]] + modId="minecraft" + mandatory=true + versionRange="${minecraft_version_range}" + ordering="NONE" + side="BOTH" + +[[dependencies.${mod_id}]] + modId="farmersdelight" + mandatory=false + versionRange="[1.19.2-1.2.0,)" + ordering="AFTER" + side="BOTH" + +[[dependencies.${mod_id}]] + modId="create" + mandatory=false + versionRange="[0.5.1,)" + ordering="AFTER" + side="BOTH" diff --git a/1.19.2/src/main/resources/assets/kofola/blockstates/kofola_crate.json b/1.19.2/src/main/resources/assets/kofola/blockstates/kofola_crate.json new file mode 100644 index 0000000..e9da639 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/blockstates/kofola_crate.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "kofola:block/kofola_crate" }, + "facing=south": { "model": "kofola:block/kofola_crate", "y": 180 }, + "facing=west": { "model": "kofola:block/kofola_crate", "y": 270 }, + "facing=east": { "model": "kofola:block/kofola_crate", "y": 90 } + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/lang/cs_cz.json b/1.19.2/src/main/resources/assets/kofola/lang/cs_cz.json new file mode 100644 index 0000000..bdd6d98 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/lang/cs_cz.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Láhev Kofoly", + "item.kofola.kofola_bottle.desc": "Když ji miluješ, není co řešit.", + "item.kofola.kofola_bottle.effect": "Dodává Rychlost, Spěch a zahání únavu", + + "item.kofola.kofola_can": "Plechovka Kofoly", + "item.kofola.kofola_can.desc": "Rychlé osvěžení na cesty.", + + "item.kofola.draft_kofola": "Točená Kofola", + "item.kofola.draft_kofola.desc": "Poctivě vychlazená s jemnou pěnou.", + "item.kofola.draft_kofola.effect": "Poskytuje silnou regeneraci a vitalitu", + + "item.kofola.kofo_syrup": "Sirup KOFO", + "item.kofola.kofo_syrup.desc": "Originální bylinkový extrakt ze 14 ingrediencí.", + + "item.kofola.kofola_bucket": "Kbelík Kofoly", + "block.kofola.kofola_crate": "Přepravka Kofoly", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.19.2/src/main/resources/assets/kofola/lang/de_de.json b/1.19.2/src/main/resources/assets/kofola/lang/de_de.json new file mode 100644 index 0000000..3b40611 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/lang/de_de.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Flasche Kofola", + "item.kofola.kofola_bottle.desc": "Wenn du sie liebst, gibt es nichts zu bereden.", + "item.kofola.kofola_bottle.effect": "Verleiht Schnelligkeit, Eile und heilt Müdigkeit", + + "item.kofola.kofola_can": "Dose Kofola", + "item.kofola.kofola_can.desc": "Schnelle Erfrischung für unterwegs.", + + "item.kofola.draft_kofola": "Gezapfte Kofola", + "item.kofola.draft_kofola.desc": "Perfekt gekühlt mit feiner Schaumkrone.", + "item.kofola.draft_kofola.effect": "Verleiht starke Regeneration und Vitalität", + + "item.kofola.kofo_syrup": "KOFO-Sirup", + "item.kofola.kofo_syrup.desc": "Original Kräuterextrakt aus 14 Zutaten.", + + "item.kofola.kofola_bucket": "Kofola-Eimer", + "block.kofola.kofola_crate": "Kofola-Kiste", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.19.2/src/main/resources/assets/kofola/lang/en_us.json b/1.19.2/src/main/resources/assets/kofola/lang/en_us.json new file mode 100644 index 0000000..1abdedc --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/lang/en_us.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Bottle of Kofola", + "item.kofola.kofola_bottle.desc": "When you love it, there's nothing to question.", + "item.kofola.kofola_bottle.effect": "Grants Speed, Haste and cures fatigue", + + "item.kofola.kofola_can": "Can of Kofola", + "item.kofola.kofola_can.desc": "Fast refreshing drink on the go.", + + "item.kofola.draft_kofola": "Draft Kofola", + "item.kofola.draft_kofola.desc": "Chilled to perfection with creamy foam.", + "item.kofola.draft_kofola.effect": "Grants superior regeneration and vitality", + + "item.kofola.kofo_syrup": "KOFO Syrup", + "item.kofola.kofo_syrup.desc": "Original herbal extract made from 14 ingredients.", + + "item.kofola.kofola_bucket": "Kofola Bucket", + "block.kofola.kofola_crate": "Kofola Crate", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.19.2/src/main/resources/assets/kofola/lang/pl_pl.json b/1.19.2/src/main/resources/assets/kofola/lang/pl_pl.json new file mode 100644 index 0000000..10321ba --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/lang/pl_pl.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Butelka Kofoli", + "item.kofola.kofola_bottle.desc": "Gdy ją kochasz, nie ma o czym gadać.", + "item.kofola.kofola_bottle.effect": "Daje Szybkość, Pośpiech i usuwa zmęczenie", + + "item.kofola.kofola_can": "Puszka Kofoli", + "item.kofola.kofola_can.desc": "Szybkie orzeźwienie w podróży.", + + "item.kofola.draft_kofola": "Kofola z Nalewaka", + "item.kofola.draft_kofola.desc": "Schłodzona do perfekcji z aksamitną pianką.", + "item.kofola.draft_kofola.effect": "Zapewnia silną regenerację i energię", + + "item.kofola.kofo_syrup": "Syrop KOFO", + "item.kofola.kofo_syrup.desc": "Oryginalny ekstrakt ziołowy z 14 składników.", + + "item.kofola.kofola_bucket": "Wiadro Kofoli", + "block.kofola.kofola_crate": "Skrzynka Kofoli", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.19.2/src/main/resources/assets/kofola/lang/sk_sk.json b/1.19.2/src/main/resources/assets/kofola/lang/sk_sk.json new file mode 100644 index 0000000..3a6d445 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/lang/sk_sk.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Fľaša Kofoly", + "item.kofola.kofola_bottle.desc": "Keď ju miluješ, niet čo riešiť.", + "item.kofola.kofola_bottle.effect": "Dodáva Rýchlosť, Náhlenie a zaháňa únavu", + + "item.kofola.kofola_can": "Plechovka Kofoly", + "item.kofola.kofola_can.desc": "Rýchle osvieženie na cesty.", + + "item.kofola.draft_kofola": "Čapovaná Kofola", + "item.kofola.draft_kofola.desc": "Poctivo vychladená s jemnou penou.", + "item.kofola.draft_kofola.effect": "Poskytuje silnú regeneráciu a vitalitu", + + "item.kofola.kofo_syrup": "Sirup KOFO", + "item.kofola.kofo_syrup.desc": "Originálny bylinkový extrakt zo 14 ingrediencií.", + + "item.kofola.kofola_bucket": "Vedro Kofoly", + "block.kofola.kofola_crate": "Prepravka Kofoly", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/block/kofola_crate.json b/1.19.2/src/main/resources/assets/kofola/models/block/kofola_crate.json new file mode 100644 index 0000000..db7442c --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/block/kofola_crate.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "kofola:block/kofola_crate_side", + "down": "kofola:block/kofola_crate_bottom", + "up": "kofola:block/kofola_crate_top", + "north": "kofola:block/kofola_crate_front", + "south": "kofola:block/kofola_crate_front", + "east": "kofola:block/kofola_crate_side", + "west": "kofola:block/kofola_crate_side" + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/item/draft_kofola.json b/1.19.2/src/main/resources/assets/kofola/models/item/draft_kofola.json new file mode 100644 index 0000000..174ef40 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/item/draft_kofola.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/draft_kofola" + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/item/kofo_syrup.json b/1.19.2/src/main/resources/assets/kofola/models/item/kofo_syrup.json new file mode 100644 index 0000000..fe7929e --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/item/kofo_syrup.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofo_syrup" + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/item/kofola_bottle.json b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_bottle.json new file mode 100644 index 0000000..ff66c5d --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofola_bottle" + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/item/kofola_bucket.json b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_bucket.json new file mode 100644 index 0000000..8b92a68 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofola_bucket" + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/item/kofola_can.json b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_can.json new file mode 100644 index 0000000..e2e1efc --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_can.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofola_can" + } +} diff --git a/1.19.2/src/main/resources/assets/kofola/models/item/kofola_crate.json b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_crate.json new file mode 100644 index 0000000..33393e5 --- /dev/null +++ b/1.19.2/src/main/resources/assets/kofola/models/item/kofola_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "kofola:block/kofola_crate" +} diff --git a/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_bottom.png b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_bottom.png new file mode 100644 index 0000000..93c08a4 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_bottom.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_front.png b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_front.png new file mode 100644 index 0000000..852e475 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_front.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_side.png b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_side.png new file mode 100644 index 0000000..56bf62d Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_side.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_top.png b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_top.png new file mode 100644 index 0000000..dda10e5 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_crate_top.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_flow.png b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_flow.png new file mode 100644 index 0000000..6f787a1 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_flow.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_still.png b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_still.png new file mode 100644 index 0000000..2eae175 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/block/kofola_still.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/item/draft_kofola.png b/1.19.2/src/main/resources/assets/kofola/textures/item/draft_kofola.png new file mode 100644 index 0000000..6498031 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/item/draft_kofola.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/item/kofo_syrup.png b/1.19.2/src/main/resources/assets/kofola/textures/item/kofo_syrup.png new file mode 100644 index 0000000..9856334 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/item/kofo_syrup.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_bottle.png b/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_bottle.png new file mode 100644 index 0000000..dd00a87 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_bottle.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_bucket.png b/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_bucket.png new file mode 100644 index 0000000..79a4caf Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_bucket.png differ diff --git a/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_can.png b/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_can.png new file mode 100644 index 0000000..37c7119 Binary files /dev/null and b/1.19.2/src/main/resources/assets/kofola/textures/item/kofola_can.png differ diff --git a/1.19.2/src/main/resources/data/create/recipes/emptying/emptying_bottle.json b/1.19.2/src/main/resources/data/create/recipes/emptying/emptying_bottle.json new file mode 100644 index 0000000..479704d --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/emptying/emptying_bottle.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "kofola:kofola_bottle" + } + ], + "results": [ + { + "item": "minecraft:glass_bottle" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 250 + } + ] +} diff --git a/1.19.2/src/main/resources/data/create/recipes/emptying/emptying_bucket.json b/1.19.2/src/main/resources/data/create/recipes/emptying/emptying_bucket.json new file mode 100644 index 0000000..6d5b4cd --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/emptying/emptying_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "kofola:kofola_bucket" + } + ], + "results": [ + { + "item": "minecraft:bucket" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ] +} diff --git a/1.19.2/src/main/resources/data/create/recipes/filling/filling_bottle.json b/1.19.2/src/main/resources/data/create/recipes/filling/filling_bottle.json new file mode 100644 index 0000000..0ddf37d --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/filling/filling_bottle.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "minecraft:glass_bottle" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 250 + } + ], + "results": [ + { + "item": "kofola:kofola_bottle" + } + ] +} diff --git a/1.19.2/src/main/resources/data/create/recipes/filling/filling_bucket.json b/1.19.2/src/main/resources/data/create/recipes/filling/filling_bucket.json new file mode 100644 index 0000000..fb29438 --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/filling/filling_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "minecraft:bucket" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ], + "results": [ + { + "item": "kofola:kofola_bucket" + } + ] +} diff --git a/1.19.2/src/main/resources/data/create/recipes/filling/filling_can.json b/1.19.2/src/main/resources/data/create/recipes/filling/filling_can.json new file mode 100644 index 0000000..1444862 --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/filling/filling_can.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "minecraft:iron_nugget" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 250 + } + ], + "results": [ + { + "item": "kofola:kofola_can" + } + ] +} diff --git a/1.19.2/src/main/resources/data/create/recipes/mixing/mixing_kofola_brewing.json b/1.19.2/src/main/resources/data/create/recipes/mixing/mixing_kofola_brewing.json new file mode 100644 index 0000000..0400420 --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/mixing/mixing_kofola_brewing.json @@ -0,0 +1,34 @@ +{ + "type": "create:mixing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "heatRequirement": "heated", + "ingredients": [ + { + "fluid": "minecraft:water", + "amount": 1000 + }, + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "item": "minecraft:cocoa_beans" + }, + { + "item": "minecraft:apple" + } + ], + "results": [ + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ] +} diff --git a/1.19.2/src/main/resources/data/create/recipes/mixing/mixing_kofola_from_syrup.json b/1.19.2/src/main/resources/data/create/recipes/mixing/mixing_kofola_from_syrup.json new file mode 100644 index 0000000..7db7d07 --- /dev/null +++ b/1.19.2/src/main/resources/data/create/recipes/mixing/mixing_kofola_from_syrup.json @@ -0,0 +1,24 @@ +{ + "type": "create:mixing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "fluid": "minecraft:water", + "amount": 1000 + }, + { + "item": "kofola:kofo_syrup" + } + ], + "results": [ + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ] +} diff --git a/1.19.2/src/main/resources/data/farmersdelight/recipes/cooking_kofo_syrup.json b/1.19.2/src/main/resources/data/farmersdelight/recipes/cooking_kofo_syrup.json new file mode 100644 index 0000000..ee1c4ff --- /dev/null +++ b/1.19.2/src/main/resources/data/farmersdelight/recipes/cooking_kofo_syrup.json @@ -0,0 +1,23 @@ +{ + "type": "farmersdelight:cooking", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "farmersdelight" + } + ], + "ingredients": [ + { "item": "minecraft:sugar" }, + { "item": "minecraft:sweet_berries" }, + { "item": "minecraft:cocoa_beans" }, + { "item": "minecraft:apple" } + ], + "result": { + "item": "kofola:kofo_syrup" + }, + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 200, + "experience": 0.5 +} diff --git a/1.19.2/src/main/resources/data/farmersdelight/recipes/cooking_kofola_bottle.json b/1.19.2/src/main/resources/data/farmersdelight/recipes/cooking_kofola_bottle.json new file mode 100644 index 0000000..e62892e --- /dev/null +++ b/1.19.2/src/main/resources/data/farmersdelight/recipes/cooking_kofola_bottle.json @@ -0,0 +1,21 @@ +{ + "type": "farmersdelight:cooking", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "farmersdelight" + } + ], + "ingredients": [ + { "item": "kofola:kofo_syrup" }, + { "item": "minecraft:sugar" } + ], + "result": { + "item": "kofola:kofola_bottle" + }, + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 100, + "experience": 0.3 +} diff --git a/1.19.2/src/main/resources/data/farmersdelight/tags/items/drinks.json b/1.19.2/src/main/resources/data/farmersdelight/tags/items/drinks.json new file mode 100644 index 0000000..342be44 --- /dev/null +++ b/1.19.2/src/main/resources/data/farmersdelight/tags/items/drinks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_bottle", + "kofola:kofola_can", + "kofola:draft_kofola" + ] +} diff --git a/1.19.2/src/main/resources/data/forge/tags/fluids/kofola.json b/1.19.2/src/main/resources/data/forge/tags/fluids/kofola.json new file mode 100644 index 0000000..33411d5 --- /dev/null +++ b/1.19.2/src/main/resources/data/forge/tags/fluids/kofola.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_fluid", + "kofola:flowing_kofola_fluid" + ] +} diff --git a/1.19.2/src/main/resources/data/forge/tags/items/drinks.json b/1.19.2/src/main/resources/data/forge/tags/items/drinks.json new file mode 100644 index 0000000..342be44 --- /dev/null +++ b/1.19.2/src/main/resources/data/forge/tags/items/drinks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_bottle", + "kofola:kofola_can", + "kofola:draft_kofola" + ] +} diff --git a/1.19.2/src/main/resources/data/kofola/loot_tables/blocks/kofola_crate.json b/1.19.2/src/main/resources/data/kofola/loot_tables/blocks/kofola_crate.json new file mode 100644 index 0000000..d6e38a5 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/loot_tables/blocks/kofola_crate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "kofola:kofola_crate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/draft_kofola.json b/1.19.2/src/main/resources/data/kofola/recipes/draft_kofola.json new file mode 100644 index 0000000..32ff193 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/draft_kofola.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "kofola:kofola_bottle" }, + { "item": "minecraft:ice" } + ], + "result": { + "item": "kofola:draft_kofola", + "count": 1 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofo_syrup.json b/1.19.2/src/main/resources/data/kofola/recipes/kofo_syrup.json new file mode 100644 index 0000000..b7a314e --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofo_syrup.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "minecraft:glass_bottle" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sweet_berries" }, + { "item": "minecraft:cocoa_beans" }, + { "item": "minecraft:apple" } + ], + "result": { + "item": "kofola:kofo_syrup", + "count": 1 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottle.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottle.json new file mode 100644 index 0000000..180e3b9 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottle.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "kofola:kofo_syrup" }, + { "item": "minecraft:water_bucket" }, + { "item": "minecraft:glass_bottle" }, + { "item": "minecraft:glass_bottle" }, + { "item": "minecraft:glass_bottle" } + ], + "result": { + "item": "kofola:kofola_bottle", + "count": 3 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottle_alt.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottle_alt.json new file mode 100644 index 0000000..cea6e22 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottle_alt.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "kofola:kofo_syrup" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:glass_bottle" } + ], + "result": { + "item": "kofola:kofola_bottle", + "count": 1 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottles_from_bucket.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottles_from_bucket.json new file mode 100644 index 0000000..da19b58 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bottles_from_bucket.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "kofola:kofola_bucket" }, + { "item": "minecraft:glass_bottle" }, + { "item": "minecraft:glass_bottle" }, + { "item": "minecraft:glass_bottle" }, + { "item": "minecraft:glass_bottle" } + ], + "result": { + "item": "kofola:kofola_bottle", + "count": 4 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_bucket_from_bottles.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bucket_from_bottles.json new file mode 100644 index 0000000..26cc5fe --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_bucket_from_bottles.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "minecraft:bucket" }, + { "item": "kofola:kofola_bottle" }, + { "item": "kofola:kofola_bottle" }, + { "item": "kofola:kofola_bottle" }, + { "item": "kofola:kofola_bottle" } + ], + "result": { + "item": "kofola:kofola_bucket", + "count": 1 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_can.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_can.json new file mode 100644 index 0000000..1a11a2e --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_can.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "kofola:kofola_bottle" }, + { "item": "minecraft:iron_nugget" } + ], + "result": { + "item": "kofola:kofola_can", + "count": 1 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_crate.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_crate.json new file mode 100644 index 0000000..8c0a309 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_crate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB", + "BPB", + "BBB" + ], + "key": { + "B": { + "item": "kofola:kofola_bottle" + }, + "P": { + "tag": "minecraft:planks" + } + }, + "result": { + "item": "kofola:kofola_crate", + "count": 1 + } +} diff --git a/1.19.2/src/main/resources/data/kofola/recipes/kofola_crate_unpack.json b/1.19.2/src/main/resources/data/kofola/recipes/kofola_crate_unpack.json new file mode 100644 index 0000000..199d072 --- /dev/null +++ b/1.19.2/src/main/resources/data/kofola/recipes/kofola_crate_unpack.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "kofola:kofola_crate" } + ], + "result": { + "item": "kofola:kofola_bottle", + "count": 8 + } +} diff --git a/1.19.2/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/1.19.2/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000..b71f436 --- /dev/null +++ b/1.19.2/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_crate" + ] +} diff --git a/1.19.2/src/main/resources/icon.png b/1.19.2/src/main/resources/icon.png new file mode 100644 index 0000000..a57cdeb Binary files /dev/null and b/1.19.2/src/main/resources/icon.png differ diff --git a/1.19.2/src/main/resources/pack.mcmeta b/1.19.2/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..790b672 --- /dev/null +++ b/1.19.2/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": "Kofola Mod Resources", + "pack_format": 9, + "forge:resource_pack_format": 9, + "forge:data_pack_format": 10 + } +} diff --git a/1.21.1/.gitattributes b/1.21.1/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/1.21.1/.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/1.21.1/.gitignore b/1.21.1/.gitignore new file mode 100644 index 0000000..c3a6e6d --- /dev/null +++ b/1.21.1/.gitignore @@ -0,0 +1,26 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge_README.txt +forge*changelog.txt diff --git a/1.21.1/LICENSE.txt b/1.21.1/LICENSE.txt new file mode 100644 index 0000000..249debe --- /dev/null +++ b/1.21.1/LICENSE.txt @@ -0,0 +1,523 @@ +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. + +This software includes the Monocraft font from https://github.com/IdreesInc/Monocraft/ for use in the early loading +display. +========================================================================= + + + 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/1.21.1/build.gradle b/1.21.1/build.gradle new file mode 100644 index 0000000..ab1cfaf --- /dev/null +++ b/1.21.1/build.gradle @@ -0,0 +1,53 @@ +plugins { + id 'java' + id 'idea' + id 'eclipse' + id 'net.minecraftforge.gradle' version '[7.0.3,8)' +} + +version = '1.0.1' +group = 'cz.kofolamod' + +base { + archivesName = 'kofola' +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +sourceSets.main.resources { srcDir 'src/generated/resources' } + +minecraft { + mappings channel: 'official', version: '1.21.1' + + runs { + configureEach { + workingDir = layout.projectDirectory.dir('run') + systemProperty 'forge.enabledGameTestNamespaces', 'kofola' + } + + register('client') + register('server') { + args '--nogui' + } + register('gameTestServer') + register('data') { + workingDir = layout.projectDirectory.dir('run-data') + args '--mod', 'kofola', '--all', '--output', layout.projectDirectory.dir('src/generated/resources'), '--existing', layout.projectDirectory.dir('src/main/resources') + } + } +} + +repositories { + minecraft.mavenizer(it) + maven fg.forgeMaven + maven fg.minecraftLibsMaven + mavenCentral() +} + +dependencies { + implementation minecraft.dependency('net.minecraftforge:forge:1.21.1-52.1.20') +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} diff --git a/1.21.1/changelog.txt b/1.21.1/changelog.txt new file mode 100644 index 0000000..7795712 --- /dev/null +++ b/1.21.1/changelog.txt @@ -0,0 +1,193 @@ +1.21.1 Changelog +52.1 +==== + - 52.1.20 Add protection against large network channel lists + - 52.1.19 Fix legacy object holders not being fired in the registry specific codepath + Better optimize the scanning for object holders by unrolling streams. + - 52.1.18 Store object holder handlers per registry name (#10899) + Co-authored-by: LexManos + - 52.1.17 Fix generic errors in new Eclipse compiler + - 52.1.16 Update equality check for RegistryObject to include RegistryObject#key. (#10857) + - 52.1.15 Toml parsing errors are now visible in the latest log (#10843) + - 52.1.14 Add support for multiple access transformer configs. + - 52.1.13 Migrate the MDK to ForgeGradle 7 + Backport of d29524b to 1.21.1 + - 52.1.12 Skip processing vanilla classes in RuntimeDistCleaner when running on a client + Backport of #10682 to 1.21.1 + - 52.1.11 Bump ASM and EventBus + - ASM 9.9.1 for Java 26 support + - EventBus 6.2.33 for Event#cancel() convenience method and further performance improvements + - 52.1.10 Update SecureModules to address ZipPath bug with brackets. Closes #10755 + - 52.1.9 Optimize memory allocation for checking entity fluid collisions. Backport of #10745 (#10752) + Co-authored-by: LexManos + - 52.1.8 Mark applyServerBinpatches as a dependency of BundleList. Fixes: #10729 + - 52.1.7 Migrate to Github Actions + - 52.1.6 Fix incorrect blend state for blur effects, followup to #10115 and fix for 10541 (#10678) + - 52.1.5 Fix crafter not inserting into iitemhandler (#10667) (#10669) + Co-authored-by: LexManos + - 52.1.4 Update ASM version from 9.7.1 to 9.8 + - 52.1.3 Allow command suggestions/autocomplete to search all modded paths at once without namespace provided (#10594) + - 52.1.2 Add ForgeLayeredDraw & AddGuiOverlayLayersEvent as API for gui overlay management. (#10583) + - 52.1.1 Add Pumpkin Block and Item Tags (#10511) + Backport of #10482 to 1.21.1 + - 52.1.0 1.21.1 RB 1 + https://forums.minecraftforge.net/topic/154391-forge-521-minecraft-1211/ + +52.0 +==== + - 52.0.57 Add `#forge:chorus_additionally_grows_on` tag for similiar mechanics to `#minecraft:azalea_grows_on` but for chorus (#10461) + - 52.0.56 Speed up mod annotation scanning by ~30% (#10467) + Co-authored-by: LexManos + - 52.0.55 Add missed license headers (#10476) + - 52.0.54 Redstone updates and gametests structure fixes (#10422) + Fix game test structure rotations being inconsistent (#10391) + Fix redstone update order not matching vanilla. (#10392) + Fix redstone updates for comparators going up/down incorrectly. Related: #9973 + Make block pos assertions in GameTestHelper behave like in 1.21.3, thus fixing rotated tests functionality. + This can be disabled in the Forge config if you have old tests that this breaks. Tho it is recommended you update your tests. + --------- + Co-authored-by: LexManos + - 52.0.53 Bump dependencies (#10386) + - CoreMods 5.2.4 -> 5.2.6 + - EventBus 6.2.15 -> 6.2.27 + - Reduced memory usage + - Further performance improvements + - Fixed EventBus#39, unregistered listeners are now immediately reclaimable by the GC + - Apache MavenArtifact 3.8.5 -> 3.8.8 + - NightConfig 3.7.3 -> 3.7.4 + - 52.0.52 Re-introduce ItemStack Capabilities (#10363) + Co-authored-by: RealMangoRage <64402114+RealMangorage@users.noreply.github.com> + Co-authored-by: LexManos + - 52.0.51 Re-introduce IForgeItem.damageItem when an item takes damage, Fixes #10344 (#10373) + - 52.0.50 Add updated tag context to AddReloadListenerEvent (#10421) + Fixes using custom tags in GlobalLootModifiers. + - 52.0.49 Add fast graphics render type to block model jsons (#10396) + Make modded leaves behave like vanilla leaves by default (Fixes #10389) + - 52.0.48 Fix corrupted and invalidly symlinked worlds crashing on level select (#10420) + - 52.0.47 Honor attacker shield disabling status (#10318) + - 52.0.46 Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10300) + Co-authored-by: Joseph T. McQuigg + - 52.0.45 GameTestHelper additions (#10340) + Co-authored-by: LexManos + - 52.0.44 Update Gradle to 8.12.1 (#10354) + Automate IntelliJ download sources in MDK + - 52.0.43 Fix JOpt Simple by bumping ModLauncher (#10349) + - 52.0.42 Fix JOpt Simple needing a strict version requirement declaration (#10313) + - 52.0.41 Fix incorrect method reference in TntBlock.explode() (#10328) + - 52.0.40 Bump dependencies (#10276) + - EventBus 6.2.8 -> 6.2.15 + - Bootstrap 2.1.3 -> 2.1.8 + - SecureModules 2.2.20 -> 2.2.21 + - AccessTransformers 8.2.0 -> 8.2.1 + - ModLauncher 10.2.2 -> 10.2.3 + These bumps include further cleanup and optimisations. + - 52.0.39 Simplify Title Screen Brandings (#10289) + - 52.0.38 Update jline for better darwin/arm64 support + - 52.0.37 Skip Vanilla classes for the CapabilityTokenSubclass transformer (#10224) + Co-authored-by: Paint_Ninja + - 52.0.36 Bump CoreMods to 5.2.4 (#10266) + - 52.0.35 Skip processing Forge classes in `RuntimeDistCleaner` (#10211) + Co-authored-by: Paint_Ninja + - 52.0.34 Skip Forge classes in the RuntimeEnumExtender transformer (#10197) (#10219) + Mod classes are still transformed as usual + Co-authored-by: Paint_Ninja + - 52.0.33 Deprecate `@ObjectHolder`, add a couple of fast-paths (#10195) (#10231) + Co-authored-by: Paint_Ninja + - 52.0.32 Allow mipmap lowering to be disabled (#10255) + - 52.0.31 Simplify memory usage display on loading screen (#10236) + Co-authored-by: Paint_Ninja + - 52.0.30 Fix NightConfig FileWatcher causing dedicated server to hang when exiting (#10215) + - 52.0.29 Pass player argument when firing `OnDatapackSyncEvent` (#10171) + - 52.0.28 Add optional fix of use item duration, disabled by default (#10151) + - 52.0.27 Bump CoreMods to 5.2 (#10160) + Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870 + The key features are: + - ES6 language support + - Thoroughly updated ASMAPI, with full documentation + - Bug fixes (some optional for backwards-compatibility) + - Partial internal code cleanup + - Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default + - 52.0.26 Add proper support for JPMS in normal mods.toml mods (#10125) + Make FMLModContainer read and apply Add-Opens and Add-Exports manifest entries from mod files. + Forge is now the `net.minecraftforge.forge` module instead of `forge` + https://forums.minecraftforge.net/topic/153333-proper-java-module-support-in-forge-mods/ + - 52.0.25 Add more `c` fluid tags (#10137) + Replaces the existing `forge`-namespaced tags, which are now deprecated. + Adds `c:experience` + - 52.0.24 Add `c:stripped_logs` and `c:stripped_woods` tags (#10136) + - 52.0.23 [1.21.1] Bump CoreMods and ASM (#10127) + CoreMods 5.1.13 changelog: https://gist.github.com/Jonathing/905d142447ecef670526ae27243adbba + - 52.0.22 Add `c:foods/pie` tag (#10135) + Replaces `forge:foods/pie`, which is now deprecated. + - 52.0.21 Fix back-compat with legacy `forge:` tags (#10126) + - 52.0.20 Implement the de-facto common tags, add many new Forge tags (#9955) + https://forums.minecraftforge.net/topic/152815-common-tags-in-forge/ + - 52.0.19 Patch BlockEntity.java to use getType Method (#10124) + - 52.0.18 Fix and cleanup RuntimeDistCleaner + - 52.0.17 Sync component registry ids + Fix deprecation typo + Bump ModLauncher (better stack traces) + Set Automatic-Module-Name + - 52.0.16 Fix layering of translucent sprites being broken by re-adding blur call Mojang removed (#10115) + - 52.0.15 Cleanup length and size checks (#10108) + - 52.0.14 Update vulnerable `eclipse` dependency (#10109) + - 52.0.13 Add and fire SystemMessageReceivedEvent + Replaces ClientChatReceivedEvent.System which was not fired due to Mojang changing ChatType to a registry. + - 52.0.12 Fix highlighted item tooltip rendering twice. Closes #10112 + - 52.0.11 Fix Network hooks not being initialized on GameTestServer (#10081) + Add rudimentary custom networking tests. + - 52.0.10 Fix inverted logic in TagEmptyCondition (#10069) + - 52.0.9 [1.21.1] Optionally supply `FMLJavaModLoadingContext` as a param to mod constructors (#10074) + Also made `FMLJavaModLoadingContext` extend `ModLoadingContext`. See the PR description for example usage. + - 52.0.8 Fix issues with `QuadBakingVertexConsumer` and Forge's OBJ loader (#10065) + - 52.0.7 Fire `OnDatapackSyncEvent` when a player joins a server (#10076) + - 52.0.6 Add a few Method Helpers onto ResourceKey to make getting Data Driven Entries Simpler (#10071) + - 52.0.5 Fix network channels not initializing during server transfers. Closes #10067 + - 52.0.4 [1.21.1] ModLoading cleanup and optimisations (#10052) + - 52.0.3 Properly ignore unknown mod files (#10063) + - 52.0.2 Add level access to Item.TooltipContext if available. + - 52.0.1 Load mods that declare explicit 1.21 compatibility as 1.21.1 is a minor bugfix. + - 52.0.0 1.21.1 + +51.0 +==== + - 51.0.33 Removed unneeded boat patch related to MC-119811 (#10061) + - 51.0.32 Fix network sync of custom datapack registries. + Add gametest to verify that it functions. + - 51.0.31 Add a way to render tooltips from Formatted text and TooltipComponents elements (#10056) + - 51.0.30 Fix custom creative tabs with search listing all items instead of just their own. + - 51.0.29 Patch CropBlock to use instanceOf FarmBlock check instead of hard coding to Blocks.FARMLAND (#10044) + - 51.0.28 Fix ItemStack sensitive getDefaultAttributeModifiers not being called. + - 51.0.27 Add missed @user_jvm_args.txt to run.bat + - 51.0.26 Fix `onPlaceItemIntoWorld` always resetting item stack when in creative mode (#10047) + - 51.0.25 Fix matrix stack translations for `RenderHighlightEvent` (#10050) + - 51.0.24 Fix Global Loot Modifier deserialization not having registry access. Closes #10042 and #10043 + - 51.0.23 Bump Mixin to 0.8.7 and allocate more ram to java compile tasks. + - 51.0.22 Use the new `fire()` and Result#isAllowed/isDenied/isDefault methods from EventBus (#10028) + - 51.0.21 Some build cleanup + - 51.0.20 Make HangingSignBlockEntity useable with custom BlockEntityTypes. #10038 + - 51.0.19 Send last PoseStack pos to RenderLevelStageEvent AFTER_PARTICLES stage. Fixes #10031 + - 51.0.18 Fix compile errors in MDK (#10029) + - 51.0.17 Fix converting dirt to mud consumes whole bottle (not just emptying) Closes #10027 + - 51.0.16 Add support for named sub-caps + - 51.0.15 Fix conditional checking swallowing decoding errors when loading registry entries from datapacks. Fixes #9995 + - 51.0.14 Apply license headers + - 51.0.13 Some code cleanup in ModInfo/ModFileInfo to use less streams and make things easier to debug. + - 51.0.12 Bump NightConfig to 3.7.3, to fix toml sub-configs being completely broken. Fixes #10015 + - 51.0.11 Make ForgeSpawnEgg assume color is opaque if alpha is set to 0. + Fixes "invisible" spawn eggs by default, but still allows modders to specify partial transparency. + - 51.0.10 Fixed perspective rendering in SeparateTransformsModel (#10014) + - 51.0.9 Fix missed PartEntity patch in Player.attack (#10011) + - 51.0.8 Choose default JarJar mod file type based on parent JAR Closes #9939 + - 51.0.7 Fixed falling block entities not rendering as moving blocks (#10006) + - 51.0.6 Bump Night Config, Should fix #9122 + - 51.0.5 Fix ClientTickEvent not firing properly. + - 51.0.4 Change tick event to have pre/post classes (#9890) + - 51.0.3 Fix Bogged and Wolf armor not being shearable by custom shears. Closes #10005 + - 51.0.2 Set team city branch + - 51.0.1 Remove Non-HolderLookup methods from INBTSerializeable and mark it as deprecated in favor of using Vanilla's new Component system. Closes #9998 + - 51.0.0 1.21 Update + Co-authored-by: RealMangoRage <64402114+RealMangorage@users.noreply.github.com> + Co-authored-by: Daniel Norris + Co-authored-by: Ven + diff --git a/1.21.1/gradle.properties b/1.21.1/gradle.properties new file mode 100644 index 0000000..6102b5c --- /dev/null +++ b/1.21.1/gradle.properties @@ -0,0 +1,11 @@ +org.gradle.caching=true +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.jvmargs=-Xmx3G +org.gradle.java.home=C:\\Program Files\\Java\\jdk-21 + +org.gradle.configuration-cache=true +org.gradle.configuration-cache.parallel=true +org.gradle.configuration-cache.problems=warn + +net.minecraftforge.gradle.merge-source-sets=true diff --git a/1.21.1/gradle/wrapper/gradle-wrapper.jar b/1.21.1/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/1.21.1/gradle/wrapper/gradle-wrapper.jar differ diff --git a/1.21.1/gradle/wrapper/gradle-wrapper.properties b/1.21.1/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..8d9046d --- /dev/null +++ b/1.21.1/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/1.21.1/gradlew b/1.21.1/gradlew new file mode 100644 index 0000000..f3b75f3 --- /dev/null +++ b/1.21.1/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/1.21.1/gradlew.bat b/1.21.1/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/1.21.1/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/1.21.1/settings.gradle b/1.21.1/settings.gradle new file mode 100644 index 0000000..46f898f --- /dev/null +++ b/1.21.1/settings.gradle @@ -0,0 +1,5 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} + +rootProject.name = 'examplemod' diff --git a/1.21.1/src/main/java/cz/kofolamod/KofolaMod.java b/1.21.1/src/main/java/cz/kofolamod/KofolaMod.java new file mode 100644 index 0000000..b8bd362 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/KofolaMod.java @@ -0,0 +1,67 @@ +package cz.kofolamod; + +import cz.kofolamod.recipe.KofolaBrewingRecipe; +import cz.kofolamod.registry.ModBlocks; +import cz.kofolamod.registry.ModCreativeModeTabs; +import cz.kofolamod.registry.ModFluids; +import cz.kofolamod.registry.ModItems; +import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; +import net.minecraftforge.event.brewing.BrewingRecipeRegisterEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Mod(KofolaMod.MOD_ID) +public class KofolaMod { + public static final String MOD_ID = "kofola"; + public static final Logger LOGGER = LoggerFactory.getLogger(KofolaMod.class); + + public KofolaMod(FMLJavaModLoadingContext context) { + IEventBus modEventBus = context.getModEventBus(); + + ModFluids.FLUID_TYPES.register(modEventBus); + ModFluids.FLUIDS.register(modEventBus); + ModBlocks.BLOCKS.register(modEventBus); + ModItems.ITEMS.register(modEventBus); + ModCreativeModeTabs.CREATIVE_MODE_TABS.register(modEventBus); + + modEventBus.addListener(this::addCreative); + + MinecraftForge.EVENT_BUS.register(this); + LOGGER.info("Kofola Mod (Forge 1.21.1) initialized! Kdyz ji milujes, neni co resit."); + } + + @SubscribeEvent + public void onBrewingRecipeRegister(BrewingRecipeRegisterEvent event) { + event.addRecipe(new KofolaBrewingRecipe()); + LOGGER.info("Kofola brewing recipes registered."); + } + + private void addCreative(BuildCreativeModeTabContentsEvent event) { + if (event.getTabKey() == CreativeModeTabs.FOOD_AND_DRINKS) { + event.accept(ModItems.KOFO_SYRUP); + event.accept(ModItems.KOFOLA_BOTTLE); + event.accept(ModItems.KOFOLA_CAN); + event.accept(ModItems.DRAFT_KOFOLA); + } + } + + @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) + public static class ClientModEvents { + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) { + ItemBlockRenderTypes.setRenderLayer(ModFluids.KOFOLA_SOURCE.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(ModFluids.KOFOLA_FLOWING.get(), RenderType.translucent()); + ItemBlockRenderTypes.setRenderLayer(ModBlocks.KOFOLA_CRATE.get(), RenderType.cutout()); + } + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/block/KofolaCrateBlock.java b/1.21.1/src/main/java/cz/kofolamod/block/KofolaCrateBlock.java new file mode 100644 index 0000000..0444eb3 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/block/KofolaCrateBlock.java @@ -0,0 +1,45 @@ +package cz.kofolamod.block; + +import com.mojang.serialization.MapCodec; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.material.MapColor; +import org.jetbrains.annotations.Nullable; + +public class KofolaCrateBlock extends HorizontalDirectionalBlock { + public static final MapCodec CODEC = simpleCodec(KofolaCrateBlock::new); + + public KofolaCrateBlock(BlockBehaviour.Properties properties) { + super(properties); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); + } + + public KofolaCrateBlock() { + this(BlockBehaviour.Properties.of() + .mapColor(MapColor.WOOD) + .sound(SoundType.WOOD) + .strength(2.0F, 3.0F)); + } + + @Override + protected MapCodec codec() { + return CODEC; + } + + @Nullable + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite()); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(FACING); + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/compat/FarmersDelightCompat.java b/1.21.1/src/main/java/cz/kofolamod/compat/FarmersDelightCompat.java new file mode 100644 index 0000000..8d879e8 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/compat/FarmersDelightCompat.java @@ -0,0 +1,41 @@ +package cz.kofolamod.compat; + +import net.minecraft.core.Holder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.registries.ForgeRegistries; + +public class FarmersDelightCompat { + public static final String MOD_ID = "farmersdelight"; + + public static boolean isLoaded() { + return ModList.get().isLoaded(MOD_ID); + } + + public static void applyComfort(LivingEntity entity, int durationTicks) { + if (!isLoaded()) return; + + MobEffect comfortEffect = ForgeRegistries.MOB_EFFECTS.getValue(ResourceLocation.fromNamespaceAndPath(MOD_ID, "comfort")); + if (comfortEffect != null) { + Holder holder = ForgeRegistries.MOB_EFFECTS.getHolder(comfortEffect).orElse(null); + if (holder != null) { + entity.addEffect(new MobEffectInstance(holder, durationTicks, 0)); + } + } + } + + public static void applyNourishment(LivingEntity entity, int durationTicks) { + if (!isLoaded()) return; + + MobEffect nourishmentEffect = ForgeRegistries.MOB_EFFECTS.getValue(ResourceLocation.fromNamespaceAndPath(MOD_ID, "nourishment")); + if (nourishmentEffect != null) { + Holder holder = ForgeRegistries.MOB_EFFECTS.getHolder(nourishmentEffect).orElse(null); + if (holder != null) { + entity.addEffect(new MobEffectInstance(holder, durationTicks, 0)); + } + } + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/fluid/KofolaFluidType.java b/1.21.1/src/main/java/cz/kofolamod/fluid/KofolaFluidType.java new file mode 100644 index 0000000..9f64c10 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/fluid/KofolaFluidType.java @@ -0,0 +1,48 @@ +package cz.kofolamod.fluid; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvents; +import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; +import net.minecraftforge.common.SoundActions; +import net.minecraftforge.fluids.FluidType; + +import java.util.function.Consumer; + +public class KofolaFluidType extends FluidType { + private final ResourceLocation stillTexture; + private final ResourceLocation flowingTexture; + private final int tintColor; + + public KofolaFluidType(ResourceLocation stillTexture, ResourceLocation flowingTexture, int tintColor) { + super(FluidType.Properties.create() + .descriptionId("fluid_type.kofola.kofola_fluid") + .density(1050) + .viscosity(1100) + .sound(SoundActions.BUCKET_FILL, SoundEvents.BUCKET_FILL) + .sound(SoundActions.BUCKET_EMPTY, SoundEvents.BUCKET_EMPTY) + .sound(SoundActions.FLUID_VAPORIZE, SoundEvents.FIRE_EXTINGUISH)); + this.stillTexture = stillTexture; + this.flowingTexture = flowingTexture; + this.tintColor = tintColor; + } + + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new IClientFluidTypeExtensions() { + @Override + public ResourceLocation getStillTexture() { + return stillTexture; + } + + @Override + public ResourceLocation getFlowingTexture() { + return flowingTexture; + } + + @Override + public int getTintColor() { + return tintColor; + } + }); + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/item/DraftKofolaItem.java b/1.21.1/src/main/java/cz/kofolamod/item/DraftKofolaItem.java new file mode 100644 index 0000000..822b7d6 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/item/DraftKofolaItem.java @@ -0,0 +1,92 @@ +package cz.kofolamod.item; + +import cz.kofolamod.compat.FarmersDelightCompat; +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class DraftKofolaItem extends Item { + + public DraftKofolaItem() { + super(new Item.Properties() + .stacksTo(16) + .craftRemainder(Items.GLASS_BOTTLE) + .food(ModFoods.DRAFT_KOFOLA)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide) { + entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN); + entity.removeEffect(MobEffects.DIG_SLOWDOWN); + + FarmersDelightCompat.applyComfort(entity, 900); + FarmersDelightCompat.applyNourishment(entity, 600); + + if (entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + } + + if (stack.isEmpty()) { + return new ItemStack(Items.GLASS_BOTTLE); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack bottle = new ItemStack(Items.GLASS_BOTTLE); + if (!player.getInventory().add(bottle)) { + player.drop(bottle, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.draft_kofola.desc").withStyle(ChatFormatting.GOLD, ChatFormatting.ITALIC)); + tooltip.add(Component.translatable("item.kofola.draft_kofola.effect").withStyle(ChatFormatting.AQUA)); + super.appendHoverText(stack, context, tooltip, flag); + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/item/KofoSyrupItem.java b/1.21.1/src/main/java/cz/kofolamod/item/KofoSyrupItem.java new file mode 100644 index 0000000..a7ffb46 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/item/KofoSyrupItem.java @@ -0,0 +1,81 @@ +package cz.kofolamod.item; + +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class KofoSyrupItem extends Item { + + public KofoSyrupItem() { + super(new Item.Properties() + .stacksTo(16) + .craftRemainder(Items.GLASS_BOTTLE) + .food(ModFoods.KOFO_SYRUP)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide && entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + + if (stack.isEmpty()) { + return new ItemStack(Items.GLASS_BOTTLE); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack bottle = new ItemStack(Items.GLASS_BOTTLE); + if (!player.getInventory().add(bottle)) { + player.drop(bottle, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.kofo_syrup.desc").withStyle(ChatFormatting.DARK_GREEN, ChatFormatting.ITALIC)); + super.appendHoverText(stack, context, tooltip, flag); + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/item/KofolaBottleItem.java b/1.21.1/src/main/java/cz/kofolamod/item/KofolaBottleItem.java new file mode 100644 index 0000000..78efe6a --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/item/KofolaBottleItem.java @@ -0,0 +1,91 @@ +package cz.kofolamod.item; + +import cz.kofolamod.compat.FarmersDelightCompat; +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class KofolaBottleItem extends Item { + + public KofolaBottleItem() { + super(new Item.Properties() + .stacksTo(16) + .craftRemainder(Items.GLASS_BOTTLE) + .food(ModFoods.KOFOLA_BOTTLE)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide) { + entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN); + entity.removeEffect(MobEffects.DIG_SLOWDOWN); + + FarmersDelightCompat.applyComfort(entity, 600); + + if (entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + } + + if (stack.isEmpty()) { + return new ItemStack(Items.GLASS_BOTTLE); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack emptyBottle = new ItemStack(Items.GLASS_BOTTLE); + if (!player.getInventory().add(emptyBottle)) { + player.drop(emptyBottle, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.HONEY_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.kofola_bottle.desc").withStyle(ChatFormatting.GOLD, ChatFormatting.ITALIC)); + tooltip.add(Component.translatable("item.kofola.kofola_bottle.effect").withStyle(ChatFormatting.BLUE)); + super.appendHoverText(stack, context, tooltip, flag); + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/item/KofolaCanItem.java b/1.21.1/src/main/java/cz/kofolamod/item/KofolaCanItem.java new file mode 100644 index 0000000..13d6ef1 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/item/KofolaCanItem.java @@ -0,0 +1,80 @@ +package cz.kofolamod.item; + +import cz.kofolamod.registry.ModFoods; +import net.minecraft.ChatFormatting; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.*; +import net.minecraft.world.level.Level; + +import java.util.List; + +public class KofolaCanItem extends Item { + + public KofolaCanItem() { + super(new Item.Properties() + .stacksTo(16) + .food(ModFoods.KOFOLA_CAN)); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity entity) { + super.finishUsingItem(stack, level, entity); + + if (!level.isClientSide && entity instanceof ServerPlayer serverPlayer) { + CriteriaTriggers.CONSUME_ITEM.trigger(serverPlayer, stack); + serverPlayer.awardStat(Stats.ITEM_USED.get(this)); + } + + if (stack.isEmpty()) { + return new ItemStack(Items.IRON_NUGGET); + } else { + if (entity instanceof Player player && !player.getAbilities().instabuild) { + ItemStack nugget = new ItemStack(Items.IRON_NUGGET); + if (!player.getInventory().add(nugget)) { + player.drop(nugget, false); + } + } + return stack; + } + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 20; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + @Override + public SoundEvent getDrinkingSound() { + return SoundEvents.GENERIC_DRINK; + } + + @Override + public SoundEvent getEatingSound() { + return SoundEvents.GENERIC_DRINK; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + return ItemUtils.startUsingInstantly(level, player, hand); + } + + @Override + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltip, TooltipFlag flag) { + tooltip.add(Component.translatable("item.kofola.kofola_can.desc").withStyle(ChatFormatting.YELLOW, ChatFormatting.ITALIC)); + super.appendHoverText(stack, context, tooltip, flag); + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/recipe/KofolaBrewingRecipe.java b/1.21.1/src/main/java/cz/kofolamod/recipe/KofolaBrewingRecipe.java new file mode 100644 index 0000000..215699d --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/recipe/KofolaBrewingRecipe.java @@ -0,0 +1,34 @@ +package cz.kofolamod.recipe; + +import cz.kofolamod.registry.ModItems; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.PotionContents; +import net.minecraft.world.item.alchemy.Potions; +import net.minecraftforge.common.brewing.IBrewingRecipe; + +public class KofolaBrewingRecipe implements IBrewingRecipe { + + @Override + public boolean isInput(ItemStack input) { + if (!input.is(Items.POTION)) { + return false; + } + PotionContents contents = input.get(DataComponents.POTION_CONTENTS); + return contents != null && (contents.is(Potions.WATER) || contents.is(Potions.AWKWARD)); + } + + @Override + public boolean isIngredient(ItemStack ingredient) { + return ingredient.is(ModItems.KOFO_SYRUP.get()); + } + + @Override + public ItemStack getOutput(ItemStack input, ItemStack ingredient) { + if (isInput(input) && isIngredient(ingredient)) { + return new ItemStack(ModItems.KOFOLA_BOTTLE.get()); + } + return ItemStack.EMPTY; + } +} diff --git a/1.21.1/src/main/java/cz/kofolamod/registry/ModBlocks.java b/1.21.1/src/main/java/cz/kofolamod/registry/ModBlocks.java new file mode 100644 index 0000000..891fa2d --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/registry/ModBlocks.java @@ -0,0 +1,32 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import cz.kofolamod.block.KofolaCrateBlock; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LiquidBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModBlocks { + public static final DeferredRegister BLOCKS = + DeferredRegister.create(ForgeRegistries.BLOCKS, KofolaMod.MOD_ID); + + public static final RegistryObject KOFOLA_CRATE = BLOCKS.register("kofola_crate", + KofolaCrateBlock::new); + + public static final RegistryObject KOFOLA_FLUID_BLOCK = BLOCKS.register("kofola_fluid", + () -> new LiquidBlock(ModFluids.KOFOLA_SOURCE.get(), BlockBehaviour.Properties.of() + .mapColor(MapColor.COLOR_BROWN) + .replaceable() + .noCollission() + .strength(100.0F) + .pushReaction(PushReaction.DESTROY) + .noLootTable() + .liquid() + .sound(SoundType.EMPTY))); +} diff --git a/1.21.1/src/main/java/cz/kofolamod/registry/ModCreativeModeTabs.java b/1.21.1/src/main/java/cz/kofolamod/registry/ModCreativeModeTabs.java new file mode 100644 index 0000000..e622bff --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/registry/ModCreativeModeTabs.java @@ -0,0 +1,28 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; + +public class ModCreativeModeTabs { + public static final DeferredRegister CREATIVE_MODE_TABS = + DeferredRegister.create(Registries.CREATIVE_MODE_TAB, KofolaMod.MOD_ID); + + public static final RegistryObject KOFOLA_TAB = CREATIVE_MODE_TABS.register("kofola_tab", + () -> CreativeModeTab.builder() + .icon(() -> new ItemStack(ModItems.KOFOLA_BOTTLE.get())) + .title(Component.translatable("itemGroup.kofola_tab")) + .displayItems((parameters, output) -> { + output.accept(ModItems.KOFO_SYRUP.get()); + output.accept(ModItems.KOFOLA_BOTTLE.get()); + output.accept(ModItems.KOFOLA_CAN.get()); + output.accept(ModItems.DRAFT_KOFOLA.get()); + output.accept(ModItems.KOFOLA_BUCKET.get()); + output.accept(ModItems.KOFOLA_CRATE.get()); + }) + .build()); +} diff --git a/1.21.1/src/main/java/cz/kofolamod/registry/ModFluids.java b/1.21.1/src/main/java/cz/kofolamod/registry/ModFluids.java new file mode 100644 index 0000000..5d067c0 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/registry/ModFluids.java @@ -0,0 +1,39 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import cz.kofolamod.fluid.KofolaFluidType; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.material.FlowingFluid; +import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.fluids.FluidType; +import net.minecraftforge.fluids.ForgeFlowingFluid; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModFluids { + public static final DeferredRegister FLUID_TYPES = + DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, KofolaMod.MOD_ID); + + public static final DeferredRegister FLUIDS = + DeferredRegister.create(ForgeRegistries.FLUIDS, KofolaMod.MOD_ID); + + public static final RegistryObject KOFOLA_FLUID_TYPE = FLUID_TYPES.register("kofola_fluid", + () -> new KofolaFluidType( + ResourceLocation.fromNamespaceAndPath(KofolaMod.MOD_ID, "block/kofola_still"), + ResourceLocation.fromNamespaceAndPath(KofolaMod.MOD_ID, "block/kofola_flow"), + 0xFFFFFFFF + )); + + public static final RegistryObject KOFOLA_SOURCE = FLUIDS.register("kofola_fluid", + () -> new ForgeFlowingFluid.Source(ModFluids.KOFOLA_PROPERTIES)); + + public static final RegistryObject KOFOLA_FLOWING = FLUIDS.register("flowing_kofola_fluid", + () -> new ForgeFlowingFluid.Flowing(ModFluids.KOFOLA_PROPERTIES)); + + public static final ForgeFlowingFluid.Properties KOFOLA_PROPERTIES = new ForgeFlowingFluid.Properties( + KOFOLA_FLUID_TYPE, + KOFOLA_SOURCE, + KOFOLA_FLOWING + ).slopeFindDistance(4).levelDecreasePerBlock(1).block(ModBlocks.KOFOLA_FLUID_BLOCK).bucket(ModItems.KOFOLA_BUCKET); +} diff --git a/1.21.1/src/main/java/cz/kofolamod/registry/ModFoods.java b/1.21.1/src/main/java/cz/kofolamod/registry/ModFoods.java new file mode 100644 index 0000000..eba78e6 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/registry/ModFoods.java @@ -0,0 +1,40 @@ +package cz.kofolamod.registry; + +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.food.FoodProperties; + +public class ModFoods { + public static final FoodProperties KOFOLA_BOTTLE = new FoodProperties.Builder() + .nutrition(6) + .saturationModifier(0.7F) + .alwaysEdible() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 600, 0), 1.0F) + .effect(new MobEffectInstance(MobEffects.DIG_SPEED, 900, 0), 1.0F) + .build(); + + public static final FoodProperties KOFOLA_CAN = new FoodProperties.Builder() + .nutrition(5) + .saturationModifier(0.6F) + .alwaysEdible() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 500, 0), 1.0F) + .effect(new MobEffectInstance(MobEffects.DIG_SPEED, 600, 0), 1.0F) + .build(); + + public static final FoodProperties DRAFT_KOFOLA = new FoodProperties.Builder() + .nutrition(8) + .saturationModifier(0.8F) + .alwaysEdible() + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SPEED, 600, 1), 1.0F) + .effect(new MobEffectInstance(MobEffects.DIG_SPEED, 900, 1), 1.0F) + .effect(new MobEffectInstance(MobEffects.REGENERATION, 300, 0), 1.0F) + .build(); + + public static final FoodProperties KOFO_SYRUP = new FoodProperties.Builder() + .nutrition(3) + .saturationModifier(0.3F) + .alwaysEdible() + .effect(new MobEffectInstance(MobEffects.DIG_SPEED, 1200, 1), 1.0F) + .effect(new MobEffectInstance(MobEffects.CONFUSION, 100, 0), 0.7F) + .build(); +} diff --git a/1.21.1/src/main/java/cz/kofolamod/registry/ModItems.java b/1.21.1/src/main/java/cz/kofolamod/registry/ModItems.java new file mode 100644 index 0000000..ed6f567 --- /dev/null +++ b/1.21.1/src/main/java/cz/kofolamod/registry/ModItems.java @@ -0,0 +1,38 @@ +package cz.kofolamod.registry; + +import cz.kofolamod.KofolaMod; +import cz.kofolamod.item.DraftKofolaItem; +import cz.kofolamod.item.KofoSyrupItem; +import cz.kofolamod.item.KofolaBottleItem; +import cz.kofolamod.item.KofolaCanItem; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.BucketItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModItems { + public static final DeferredRegister ITEMS = + DeferredRegister.create(ForgeRegistries.ITEMS, KofolaMod.MOD_ID); + + public static final RegistryObject KOFO_SYRUP = ITEMS.register("kofo_syrup", + KofoSyrupItem::new); + + public static final RegistryObject KOFOLA_BOTTLE = ITEMS.register("kofola_bottle", + KofolaBottleItem::new); + + public static final RegistryObject KOFOLA_CAN = ITEMS.register("kofola_can", + KofolaCanItem::new); + + public static final RegistryObject DRAFT_KOFOLA = ITEMS.register("draft_kofola", + DraftKofolaItem::new); + + public static final RegistryObject KOFOLA_BUCKET = ITEMS.register("kofola_bucket", + () -> new BucketItem(ModFluids.KOFOLA_SOURCE.get(), + new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); + + public static final RegistryObject KOFOLA_CRATE = ITEMS.register("kofola_crate", + () -> new BlockItem(ModBlocks.KOFOLA_CRATE.get(), new Item.Properties())); +} diff --git a/1.21.1/src/main/resources/META-INF/mods.toml b/1.21.1/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..d785436 --- /dev/null +++ b/1.21.1/src/main/resources/META-INF/mods.toml @@ -0,0 +1,39 @@ +modLoader="javafml" +loaderVersion="[0,)" +license="MIT" + +[[mods]] +modId="kofola" +version="1.0.1" +displayName="Kofola Mod" +logoFile="icon.png" +authors="Dominik" +description='''Pravá Kofola do Minecraftu 1.21.1! Přidává láhev Kofoly, plechovku, točenou Kofolu, sirup KOFO, přepravku a tekutou Kofolu s kompatibilitou pro Farmer's Delight a Create.''' + +[[dependencies.kofola]] + modId="forge" + mandatory=true + versionRange="[0,)" + ordering="NONE" + side="BOTH" + +[[dependencies.kofola]] + modId="minecraft" + mandatory=true + versionRange="[1.21.1,1.22)" + ordering="NONE" + side="BOTH" + +[[dependencies.kofola]] + modId="farmersdelight" + mandatory=false + versionRange="[1.21.1-1.0.0,)" + ordering="AFTER" + side="BOTH" + +[[dependencies.kofola]] + modId="create" + mandatory=false + versionRange="[0.5.1,)" + ordering="AFTER" + side="BOTH" diff --git a/1.21.1/src/main/resources/assets/kofola/blockstates/kofola_crate.json b/1.21.1/src/main/resources/assets/kofola/blockstates/kofola_crate.json new file mode 100644 index 0000000..e9da639 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/blockstates/kofola_crate.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "kofola:block/kofola_crate" }, + "facing=south": { "model": "kofola:block/kofola_crate", "y": 180 }, + "facing=west": { "model": "kofola:block/kofola_crate", "y": 270 }, + "facing=east": { "model": "kofola:block/kofola_crate", "y": 90 } + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/lang/cs_cz.json b/1.21.1/src/main/resources/assets/kofola/lang/cs_cz.json new file mode 100644 index 0000000..bdd6d98 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/lang/cs_cz.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Láhev Kofoly", + "item.kofola.kofola_bottle.desc": "Když ji miluješ, není co řešit.", + "item.kofola.kofola_bottle.effect": "Dodává Rychlost, Spěch a zahání únavu", + + "item.kofola.kofola_can": "Plechovka Kofoly", + "item.kofola.kofola_can.desc": "Rychlé osvěžení na cesty.", + + "item.kofola.draft_kofola": "Točená Kofola", + "item.kofola.draft_kofola.desc": "Poctivě vychlazená s jemnou pěnou.", + "item.kofola.draft_kofola.effect": "Poskytuje silnou regeneraci a vitalitu", + + "item.kofola.kofo_syrup": "Sirup KOFO", + "item.kofola.kofo_syrup.desc": "Originální bylinkový extrakt ze 14 ingrediencí.", + + "item.kofola.kofola_bucket": "Kbelík Kofoly", + "block.kofola.kofola_crate": "Přepravka Kofoly", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.21.1/src/main/resources/assets/kofola/lang/de_de.json b/1.21.1/src/main/resources/assets/kofola/lang/de_de.json new file mode 100644 index 0000000..3b40611 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/lang/de_de.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Flasche Kofola", + "item.kofola.kofola_bottle.desc": "Wenn du sie liebst, gibt es nichts zu bereden.", + "item.kofola.kofola_bottle.effect": "Verleiht Schnelligkeit, Eile und heilt Müdigkeit", + + "item.kofola.kofola_can": "Dose Kofola", + "item.kofola.kofola_can.desc": "Schnelle Erfrischung für unterwegs.", + + "item.kofola.draft_kofola": "Gezapfte Kofola", + "item.kofola.draft_kofola.desc": "Perfekt gekühlt mit feiner Schaumkrone.", + "item.kofola.draft_kofola.effect": "Verleiht starke Regeneration und Vitalität", + + "item.kofola.kofo_syrup": "KOFO-Sirup", + "item.kofola.kofo_syrup.desc": "Original Kräuterextrakt aus 14 Zutaten.", + + "item.kofola.kofola_bucket": "Kofola-Eimer", + "block.kofola.kofola_crate": "Kofola-Kiste", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.21.1/src/main/resources/assets/kofola/lang/en_us.json b/1.21.1/src/main/resources/assets/kofola/lang/en_us.json new file mode 100644 index 0000000..1abdedc --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/lang/en_us.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Bottle of Kofola", + "item.kofola.kofola_bottle.desc": "When you love it, there's nothing to question.", + "item.kofola.kofola_bottle.effect": "Grants Speed, Haste and cures fatigue", + + "item.kofola.kofola_can": "Can of Kofola", + "item.kofola.kofola_can.desc": "Fast refreshing drink on the go.", + + "item.kofola.draft_kofola": "Draft Kofola", + "item.kofola.draft_kofola.desc": "Chilled to perfection with creamy foam.", + "item.kofola.draft_kofola.effect": "Grants superior regeneration and vitality", + + "item.kofola.kofo_syrup": "KOFO Syrup", + "item.kofola.kofo_syrup.desc": "Original herbal extract made from 14 ingredients.", + + "item.kofola.kofola_bucket": "Kofola Bucket", + "block.kofola.kofola_crate": "Kofola Crate", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.21.1/src/main/resources/assets/kofola/lang/pl_pl.json b/1.21.1/src/main/resources/assets/kofola/lang/pl_pl.json new file mode 100644 index 0000000..10321ba --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/lang/pl_pl.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Butelka Kofoli", + "item.kofola.kofola_bottle.desc": "Gdy ją kochasz, nie ma o czym gadać.", + "item.kofola.kofola_bottle.effect": "Daje Szybkość, Pośpiech i usuwa zmęczenie", + + "item.kofola.kofola_can": "Puszka Kofoli", + "item.kofola.kofola_can.desc": "Szybkie orzeźwienie w podróży.", + + "item.kofola.draft_kofola": "Kofola z Nalewaka", + "item.kofola.draft_kofola.desc": "Schłodzona do perfekcji z aksamitną pianką.", + "item.kofola.draft_kofola.effect": "Zapewnia silną regenerację i energię", + + "item.kofola.kofo_syrup": "Syrop KOFO", + "item.kofola.kofo_syrup.desc": "Oryginalny ekstrakt ziołowy z 14 składników.", + + "item.kofola.kofola_bucket": "Wiadro Kofoli", + "block.kofola.kofola_crate": "Skrzynka Kofoli", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.21.1/src/main/resources/assets/kofola/lang/sk_sk.json b/1.21.1/src/main/resources/assets/kofola/lang/sk_sk.json new file mode 100644 index 0000000..3a6d445 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/lang/sk_sk.json @@ -0,0 +1,22 @@ +{ + "itemGroup.kofola_tab": "Kofola", + + "item.kofola.kofola_bottle": "Fľaša Kofoly", + "item.kofola.kofola_bottle.desc": "Keď ju miluješ, niet čo riešiť.", + "item.kofola.kofola_bottle.effect": "Dodáva Rýchlosť, Náhlenie a zaháňa únavu", + + "item.kofola.kofola_can": "Plechovka Kofoly", + "item.kofola.kofola_can.desc": "Rýchle osvieženie na cesty.", + + "item.kofola.draft_kofola": "Čapovaná Kofola", + "item.kofola.draft_kofola.desc": "Poctivo vychladená s jemnou penou.", + "item.kofola.draft_kofola.effect": "Poskytuje silnú regeneráciu a vitalitu", + + "item.kofola.kofo_syrup": "Sirup KOFO", + "item.kofola.kofo_syrup.desc": "Originálny bylinkový extrakt zo 14 ingrediencií.", + + "item.kofola.kofola_bucket": "Vedro Kofoly", + "block.kofola.kofola_crate": "Prepravka Kofoly", + "block.kofola.kofola_fluid": "Kofola", + "fluid_type.kofola.kofola_fluid": "Kofola" +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/block/kofola_crate.json b/1.21.1/src/main/resources/assets/kofola/models/block/kofola_crate.json new file mode 100644 index 0000000..db7442c --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/block/kofola_crate.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "kofola:block/kofola_crate_side", + "down": "kofola:block/kofola_crate_bottom", + "up": "kofola:block/kofola_crate_top", + "north": "kofola:block/kofola_crate_front", + "south": "kofola:block/kofola_crate_front", + "east": "kofola:block/kofola_crate_side", + "west": "kofola:block/kofola_crate_side" + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/item/draft_kofola.json b/1.21.1/src/main/resources/assets/kofola/models/item/draft_kofola.json new file mode 100644 index 0000000..174ef40 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/item/draft_kofola.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/draft_kofola" + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/item/kofo_syrup.json b/1.21.1/src/main/resources/assets/kofola/models/item/kofo_syrup.json new file mode 100644 index 0000000..fe7929e --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/item/kofo_syrup.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofo_syrup" + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/item/kofola_bottle.json b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_bottle.json new file mode 100644 index 0000000..ff66c5d --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofola_bottle" + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/item/kofola_bucket.json b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_bucket.json new file mode 100644 index 0000000..8b92a68 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofola_bucket" + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/item/kofola_can.json b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_can.json new file mode 100644 index 0000000..e2e1efc --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_can.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "kofola:item/kofola_can" + } +} diff --git a/1.21.1/src/main/resources/assets/kofola/models/item/kofola_crate.json b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_crate.json new file mode 100644 index 0000000..33393e5 --- /dev/null +++ b/1.21.1/src/main/resources/assets/kofola/models/item/kofola_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "kofola:block/kofola_crate" +} diff --git a/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_bottom.png b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_bottom.png new file mode 100644 index 0000000..93c08a4 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_bottom.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_front.png b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_front.png new file mode 100644 index 0000000..852e475 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_front.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_side.png b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_side.png new file mode 100644 index 0000000..56bf62d Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_side.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_top.png b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_top.png new file mode 100644 index 0000000..dda10e5 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_crate_top.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_flow.png b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_flow.png new file mode 100644 index 0000000..6f787a1 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_flow.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_still.png b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_still.png new file mode 100644 index 0000000..2eae175 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/block/kofola_still.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/item/draft_kofola.png b/1.21.1/src/main/resources/assets/kofola/textures/item/draft_kofola.png new file mode 100644 index 0000000..6498031 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/item/draft_kofola.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/item/kofo_syrup.png b/1.21.1/src/main/resources/assets/kofola/textures/item/kofo_syrup.png new file mode 100644 index 0000000..9856334 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/item/kofo_syrup.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_bottle.png b/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_bottle.png new file mode 100644 index 0000000..dd00a87 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_bottle.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_bucket.png b/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_bucket.png new file mode 100644 index 0000000..79a4caf Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_bucket.png differ diff --git a/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_can.png b/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_can.png new file mode 100644 index 0000000..37c7119 Binary files /dev/null and b/1.21.1/src/main/resources/assets/kofola/textures/item/kofola_can.png differ diff --git a/1.21.1/src/main/resources/data/create/recipes/emptying/emptying_bottle.json b/1.21.1/src/main/resources/data/create/recipes/emptying/emptying_bottle.json new file mode 100644 index 0000000..479704d --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/emptying/emptying_bottle.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "kofola:kofola_bottle" + } + ], + "results": [ + { + "item": "minecraft:glass_bottle" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 250 + } + ] +} diff --git a/1.21.1/src/main/resources/data/create/recipes/emptying/emptying_bucket.json b/1.21.1/src/main/resources/data/create/recipes/emptying/emptying_bucket.json new file mode 100644 index 0000000..6d5b4cd --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/emptying/emptying_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:emptying", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "kofola:kofola_bucket" + } + ], + "results": [ + { + "item": "minecraft:bucket" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ] +} diff --git a/1.21.1/src/main/resources/data/create/recipes/filling/filling_bottle.json b/1.21.1/src/main/resources/data/create/recipes/filling/filling_bottle.json new file mode 100644 index 0000000..0ddf37d --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/filling/filling_bottle.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "minecraft:glass_bottle" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 250 + } + ], + "results": [ + { + "item": "kofola:kofola_bottle" + } + ] +} diff --git a/1.21.1/src/main/resources/data/create/recipes/filling/filling_bucket.json b/1.21.1/src/main/resources/data/create/recipes/filling/filling_bucket.json new file mode 100644 index 0000000..fb29438 --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/filling/filling_bucket.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "minecraft:bucket" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ], + "results": [ + { + "item": "kofola:kofola_bucket" + } + ] +} diff --git a/1.21.1/src/main/resources/data/create/recipes/filling/filling_can.json b/1.21.1/src/main/resources/data/create/recipes/filling/filling_can.json new file mode 100644 index 0000000..1444862 --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/filling/filling_can.json @@ -0,0 +1,23 @@ +{ + "type": "create:filling", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "item": "minecraft:iron_nugget" + }, + { + "fluid": "kofola:kofola_fluid", + "amount": 250 + } + ], + "results": [ + { + "item": "kofola:kofola_can" + } + ] +} diff --git a/1.21.1/src/main/resources/data/create/recipes/mixing/mixing_kofola_brewing.json b/1.21.1/src/main/resources/data/create/recipes/mixing/mixing_kofola_brewing.json new file mode 100644 index 0000000..0400420 --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/mixing/mixing_kofola_brewing.json @@ -0,0 +1,34 @@ +{ + "type": "create:mixing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "heatRequirement": "heated", + "ingredients": [ + { + "fluid": "minecraft:water", + "amount": 1000 + }, + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "item": "minecraft:cocoa_beans" + }, + { + "item": "minecraft:apple" + } + ], + "results": [ + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ] +} diff --git a/1.21.1/src/main/resources/data/create/recipes/mixing/mixing_kofola_from_syrup.json b/1.21.1/src/main/resources/data/create/recipes/mixing/mixing_kofola_from_syrup.json new file mode 100644 index 0000000..7db7d07 --- /dev/null +++ b/1.21.1/src/main/resources/data/create/recipes/mixing/mixing_kofola_from_syrup.json @@ -0,0 +1,24 @@ +{ + "type": "create:mixing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "create" + } + ], + "ingredients": [ + { + "fluid": "minecraft:water", + "amount": 1000 + }, + { + "item": "kofola:kofo_syrup" + } + ], + "results": [ + { + "fluid": "kofola:kofola_fluid", + "amount": 1000 + } + ] +} diff --git a/1.21.1/src/main/resources/data/farmersdelight/recipes/cooking_kofo_syrup.json b/1.21.1/src/main/resources/data/farmersdelight/recipes/cooking_kofo_syrup.json new file mode 100644 index 0000000..ee1c4ff --- /dev/null +++ b/1.21.1/src/main/resources/data/farmersdelight/recipes/cooking_kofo_syrup.json @@ -0,0 +1,23 @@ +{ + "type": "farmersdelight:cooking", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "farmersdelight" + } + ], + "ingredients": [ + { "item": "minecraft:sugar" }, + { "item": "minecraft:sweet_berries" }, + { "item": "minecraft:cocoa_beans" }, + { "item": "minecraft:apple" } + ], + "result": { + "item": "kofola:kofo_syrup" + }, + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 200, + "experience": 0.5 +} diff --git a/1.21.1/src/main/resources/data/farmersdelight/recipes/cooking_kofola_bottle.json b/1.21.1/src/main/resources/data/farmersdelight/recipes/cooking_kofola_bottle.json new file mode 100644 index 0000000..e62892e --- /dev/null +++ b/1.21.1/src/main/resources/data/farmersdelight/recipes/cooking_kofola_bottle.json @@ -0,0 +1,21 @@ +{ + "type": "farmersdelight:cooking", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "farmersdelight" + } + ], + "ingredients": [ + { "item": "kofola:kofo_syrup" }, + { "item": "minecraft:sugar" } + ], + "result": { + "item": "kofola:kofola_bottle" + }, + "container": { + "item": "minecraft:glass_bottle" + }, + "cookingtime": 100, + "experience": 0.3 +} diff --git a/1.21.1/src/main/resources/data/farmersdelight/tags/items/drinks.json b/1.21.1/src/main/resources/data/farmersdelight/tags/items/drinks.json new file mode 100644 index 0000000..342be44 --- /dev/null +++ b/1.21.1/src/main/resources/data/farmersdelight/tags/items/drinks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_bottle", + "kofola:kofola_can", + "kofola:draft_kofola" + ] +} diff --git a/1.21.1/src/main/resources/data/forge/tags/fluids/kofola.json b/1.21.1/src/main/resources/data/forge/tags/fluids/kofola.json new file mode 100644 index 0000000..33411d5 --- /dev/null +++ b/1.21.1/src/main/resources/data/forge/tags/fluids/kofola.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_fluid", + "kofola:flowing_kofola_fluid" + ] +} diff --git a/1.21.1/src/main/resources/data/forge/tags/items/drinks.json b/1.21.1/src/main/resources/data/forge/tags/items/drinks.json new file mode 100644 index 0000000..342be44 --- /dev/null +++ b/1.21.1/src/main/resources/data/forge/tags/items/drinks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_bottle", + "kofola:kofola_can", + "kofola:draft_kofola" + ] +} diff --git a/1.21.1/src/main/resources/data/kofola/loot_tables/blocks/kofola_crate.json b/1.21.1/src/main/resources/data/kofola/loot_tables/blocks/kofola_crate.json new file mode 100644 index 0000000..d6e38a5 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/loot_tables/blocks/kofola_crate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "kofola:kofola_crate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/1.21.1/src/main/resources/data/kofola/recipes/draft_kofola.json b/1.21.1/src/main/resources/data/kofola/recipes/draft_kofola.json new file mode 100644 index 0000000..61b8eff --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/draft_kofola.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "kofola:kofola_bottle" + }, + { + "item": "minecraft:ice" + } + ], + "result": { + "count": 1, + "id": "kofola:draft_kofola" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofo_syrup.json b/1.21.1/src/main/resources/data/kofola/recipes/kofo_syrup.json new file mode 100644 index 0000000..74d9cb3 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofo_syrup.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:glass_bottle" + }, + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:sweet_berries" + }, + { + "item": "minecraft:cocoa_beans" + }, + { + "item": "minecraft:apple" + } + ], + "result": { + "count": 1, + "id": "kofola:kofo_syrup" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottle.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottle.json new file mode 100644 index 0000000..32c6ce3 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottle.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "kofola:kofo_syrup" + }, + { + "item": "minecraft:water_bucket" + }, + { + "item": "minecraft:glass_bottle" + }, + { + "item": "minecraft:glass_bottle" + }, + { + "item": "minecraft:glass_bottle" + } + ], + "result": { + "count": 3, + "id": "kofola:kofola_bottle" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottle_alt.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottle_alt.json new file mode 100644 index 0000000..5e65826 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottle_alt.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "kofola:kofo_syrup" + }, + { + "item": "minecraft:sugar" + }, + { + "item": "minecraft:glass_bottle" + } + ], + "result": { + "count": 1, + "id": "kofola:kofola_bottle" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottles_from_bucket.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottles_from_bucket.json new file mode 100644 index 0000000..355b344 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bottles_from_bucket.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "kofola:kofola_bucket" + }, + { + "item": "minecraft:glass_bottle" + }, + { + "item": "minecraft:glass_bottle" + }, + { + "item": "minecraft:glass_bottle" + }, + { + "item": "minecraft:glass_bottle" + } + ], + "result": { + "count": 4, + "id": "kofola:kofola_bottle" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_bucket_from_bottles.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bucket_from_bottles.json new file mode 100644 index 0000000..51ba0ae --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_bucket_from_bottles.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:bucket" + }, + { + "item": "kofola:kofola_bottle" + }, + { + "item": "kofola:kofola_bottle" + }, + { + "item": "kofola:kofola_bottle" + }, + { + "item": "kofola:kofola_bottle" + } + ], + "result": { + "count": 1, + "id": "kofola:kofola_bucket" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_can.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_can.json new file mode 100644 index 0000000..137a9f1 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_can.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "kofola:kofola_bottle" + }, + { + "item": "minecraft:iron_nugget" + } + ], + "result": { + "count": 1, + "id": "kofola:kofola_can" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_crate.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_crate.json new file mode 100644 index 0000000..0747117 --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_crate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB", + "BPB", + "BBB" + ], + "key": { + "B": { + "item": "kofola:kofola_bottle" + }, + "P": { + "tag": "minecraft:planks" + } + }, + "result": { + "count": 1, + "id": "kofola:kofola_crate" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/kofola/recipes/kofola_crate_unpack.json b/1.21.1/src/main/resources/data/kofola/recipes/kofola_crate_unpack.json new file mode 100644 index 0000000..5a0ae1f --- /dev/null +++ b/1.21.1/src/main/resources/data/kofola/recipes/kofola_crate_unpack.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "kofola:kofola_crate" + } + ], + "result": { + "count": 8, + "id": "kofola:kofola_bottle" + } +} \ No newline at end of file diff --git a/1.21.1/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/1.21.1/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000..b71f436 --- /dev/null +++ b/1.21.1/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "kofola:kofola_crate" + ] +} diff --git a/1.21.1/src/main/resources/icon.png b/1.21.1/src/main/resources/icon.png new file mode 100644 index 0000000..a57cdeb Binary files /dev/null and b/1.21.1/src/main/resources/icon.png differ diff --git a/1.21.1/src/main/resources/pack.mcmeta b/1.21.1/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..c90cc59 --- /dev/null +++ b/1.21.1/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Kofola Mod Resources", + "pack_format": 34 + } +} diff --git a/dist/kofola-1.19.2-1.0.1.jar b/dist/kofola-1.19.2-1.0.1.jar new file mode 100644 index 0000000..c87458d Binary files /dev/null and b/dist/kofola-1.19.2-1.0.1.jar differ diff --git a/dist/kofola-1.20.1-1.0.1.jar b/dist/kofola-1.20.1-1.0.1.jar new file mode 100644 index 0000000..1b64d39 Binary files /dev/null and b/dist/kofola-1.20.1-1.0.1.jar differ diff --git a/dist/kofola-1.21.1-1.0.1.jar b/dist/kofola-1.21.1-1.0.1.jar new file mode 100644 index 0000000..9d8fda3 Binary files /dev/null and b/dist/kofola-1.21.1-1.0.1.jar differ diff --git a/gradle.properties b/gradle.properties index a5138e4..5208b6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ mapping_version=1.20.1 mod_id=kofola mod_name=Kofola Mod mod_license=MIT -mod_version=1.0.0 +mod_version=1.0.1 mod_group_id=cz.kofolamod mod_authors=Dominik mod_description=Pravá Kofola do Minecraftu! Přidává láhev Kofoly, plechovku, točenou Kofolu, sirup KOFO, přepravku a tekutou Kofolu s kompatibilitou pro Farmer's Delight a Create. diff --git a/src/main/resources/assets/kofola/textures/item/kofola_bucket.png b/src/main/resources/assets/kofola/textures/item/kofola_bucket.png index 66581bb..79a4caf 100644 Binary files a/src/main/resources/assets/kofola/textures/item/kofola_bucket.png and b/src/main/resources/assets/kofola/textures/item/kofola_bucket.png differ diff --git a/test_kofola_bucket.png b/test_kofola_bucket.png new file mode 100644 index 0000000..be9e30b Binary files /dev/null and b/test_kofola_bucket.png differ diff --git a/update_bucket_texture.py b/update_bucket_texture.py new file mode 100644 index 0000000..e1550c6 --- /dev/null +++ b/update_bucket_texture.py @@ -0,0 +1,87 @@ +import os, zipfile, io +from PIL import Image + +client_jar = r'1.21.1\.gradle\mavenizer\repo\net\minecraft\client-extra\1.21.1-20240808.132146\client-extra-1.21.1-20240808.132146.jar' +with zipfile.ZipFile(client_jar) as z: + wb_data = z.read('assets/minecraft/textures/item/water_bucket.png') + +wb = Image.open(io.BytesIO(wb_data)).convert('RGBA') + +# Create fixed kofola bucket +kb = wb.copy() +kbp = kb.load() + +liquid_coords = [ + # Row 3 (top liquid layer) + (4, 3, (42, 17, 5, 255)), + (5, 3, (61, 28, 8, 255)), + (6, 3, (245, 222, 192, 255)), # foam speck + (7, 3, (88, 43, 16, 255)), + (8, 3, (74, 35, 12, 255)), + (9, 3, (224, 191, 154, 255)), # foam speck + (10, 3, (61, 28, 8, 255)), + (11, 3, (42, 17, 5, 255)), + # Row 4 (middle liquid layer) + (3, 4, (36, 14, 4, 255)), + (4, 4, (74, 35, 12, 255)), + (5, 4, (106, 55, 22, 255)), + (6, 4, (135, 76, 35, 255)), # bubble reflection + (7, 4, (88, 43, 16, 255)), + (8, 4, (74, 35, 12, 255)), + (9, 4, (118, 63, 27, 255)), + (10, 4, (74, 35, 12, 255)), + (11, 4, (61, 28, 8, 255)), + (12, 4, (36, 14, 4, 255)), + # Row 5 (bottom liquid layer) + (5, 5, (42, 17, 5, 255)), + (6, 5, (61, 28, 8, 255)), + (7, 5, (74, 35, 12, 255)), + (8, 5, (74, 35, 12, 255)), + (9, 5, (61, 28, 8, 255)), + (10, 5, (42, 17, 5, 255)), +] + +for x, y, col in liquid_coords: + kbp[x, y] = col + +# Save to all texture locations +destinations = [ + r'src\main\resources\assets\kofola\textures\item\kofola_bucket.png', + r'1.19.2\src\main\resources\assets\kofola\textures\item\kofola_bucket.png', + r'1.21.1\src\main\resources\assets\kofola\textures\item\kofola_bucket.png', +] + +for dst in destinations: + kb.save(dst) + print(f'Saved: {dst}') + +# Generate comparison image +artifact_dir = r'C:\Users\Dominik\.gemini\antigravity\brain\1a86ea23-89fd-4192-accd-1ecdc8465aaa' +old_img_path = os.path.join(artifact_dir, '.user_uploaded', 'media_1794768442970_e521b389.png') +old_img = Image.open(old_img_path).convert('RGBA') + +# Scale new image to 128x128 +new_scaled = kb.resize((128, 128), Image.NEAREST) +old_scaled = old_img.resize((128, 128), Image.NEAREST) + +comp_canvas = Image.new('RGBA', (128 * 2 + 60, 128 + 40), (28, 28, 34, 255)) +comp_canvas.paste(old_scaled, (20, 20), old_scaled) +comp_canvas.paste(new_scaled, (20 + 128 + 20, 20), new_scaled) +comp_path = os.path.join(artifact_dir, 'kofola_bucket_comparison.png') +comp_canvas.save(comp_path) +print(f'Comparison image saved to: {comp_path}') + +# Also update showcase image in artifact directory +items = ['kofola_bottle.png', 'kofola_can.png', 'draft_kofola.png', 'kofo_syrup.png', 'kofola_bucket.png'] +base_path = r'src\main\resources\assets\kofola\textures\item' +canvas = Image.new('RGBA', (16 * 8 * len(items) + 40, 16 * 8 + 40), (32, 24, 20, 255)) +x_off = 20 +for item_name in items: + p = os.path.join(base_path, item_name) + im = Image.open(p).convert('RGBA') + im_scaled = im.resize((128, 128), Image.NEAREST) + canvas.paste(im_scaled, (x_off, 20), im_scaled) + x_off += 128 + 8 + +canvas.save(os.path.join(artifact_dir, 'kofola_showcase.png')) +print('Showcase updated!')