commit 614d7b92414b05b804ba3960f520db5415482bc2 Author: Mutzi Date: Thu May 11 18:33:53 2023 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5af5941 --- /dev/null +++ b/.gitignore @@ -0,0 +1,151 @@ +# Created by https://www.toptal.com/developers/gitignore/api/forgegradle,intellij +# Edit at https://www.toptal.com/developers/gitignore?templates=forgegradle,intellij + +### ForgeGradle ### +# Minecraft client/server files +run/ + +### Gradle ### +.gradle +**/build/ +!src/**/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties + +# Cache of project +.gradletasknamecache + +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +### Gradle Patch ### +# Java heap dump +*.hprof + +# End of https://www.toptal.com/developers/gitignore/api/gradle + + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +# End of https://www.toptal.com/developers/gitignore/api/forgegradle,intellij diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0e20e9d --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +mattv \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..1bec35e --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..6734364 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..217e5c5 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..08fbd7d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..3a7d485 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/mattv.iml b/.idea/modules/mattv.iml new file mode 100644 index 0000000..19d4940 --- /dev/null +++ b/.idea/modules/mattv.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/mattv.main.iml b/.idea/modules/mattv.main.iml new file mode 100644 index 0000000..da4952a --- /dev/null +++ b/.idea/modules/mattv.main.iml @@ -0,0 +1,21 @@ + + + + + + + FORGE + MIXIN + MCP + + + + + + + \ No newline at end of file diff --git a/.idea/modules/mattv.test.iml b/.idea/modules/mattv.test.iml new file mode 100644 index 0000000..da4952a --- /dev/null +++ b/.idea/modules/mattv.test.iml @@ -0,0 +1,21 @@ + + + + + + + FORGE + MIXIN + MCP + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/runClient.xml b/.idea/runConfigurations/runClient.xml new file mode 100644 index 0000000..a3a2e2c --- /dev/null +++ b/.idea/runConfigurations/runClient.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/runData.xml b/.idea/runConfigurations/runData.xml new file mode 100644 index 0000000..563c5a3 --- /dev/null +++ b/.idea/runConfigurations/runData.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/runGameTestServer.xml b/.idea/runConfigurations/runGameTestServer.xml new file mode 100644 index 0000000..05395ac --- /dev/null +++ b/.idea/runConfigurations/runGameTestServer.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/.idea/runConfigurations/runServer.xml b/.idea/runConfigurations/runServer.xml new file mode 100644 index 0000000..b6ec52d --- /dev/null +++ b/.idea/runConfigurations/runServer.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d73a0d6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,692 @@ +Copyright (c) 2023 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see + + + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a1a2b5c --- /dev/null +++ b/build.gradle @@ -0,0 +1,185 @@ + +plugins { + id 'net.minecraftforge.gradle' version '5.1.+' + id 'org.jetbrains.kotlin.jvm' version '1.8.21' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21' +} + + +group = 'de.mattv.quarry' +version = '1.0' + +java { + archivesBaseName = 'MQuarry' + toolchain.languageVersion = JavaLanguageVersion.of(17) +} + +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://parchmentmc.org/docs/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: 'official', version: '1.18.2' + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // 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', 'mattv' + + mods { + quarry { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + property 'forge.enabledGameTestNamespaces', 'mattv' + + mods { + quarry { + source sourceSets.main + } + } + } + + // 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 { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + property 'forge.enabledGameTestNamespaces', 'mattv' + + mods { + quarry { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', 'quarry', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + + mods { + quarry { + source sourceSets.main + } + } + } + } +} + +// 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' + // } + maven { + name = 'Kotlin for Forge' + url = 'https://thedarkcolour.github.io/KotlinForForge/' + } + maven { + url "https://dvs1.progwml6.com/files/maven" + } + maven { + url = 'https://maven.k-4u.nl' + } +} + +dependencies { + // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft 'net.minecraftforge:forge:1.18.2-40.2.2' + + // 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 + + // Examples using mod jars from ./libs + // 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 + implementation 'thedarkcolour:kotlinforforge:3.10.0' + compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.196:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.7.0.196") + implementation fg.deobf(project.dependencies.create("mcjty.theoneprobe:theoneprobe:1.18-5.1.0-8") { + transitive = false + }) +} + +// Example for how to get properties into the manifest for reading at runtime. +jar { + manifest { + attributes([ + "Specification-Title": "quarry", + //"Specification-Vendor": "quarry authors", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": project.jar.archiveVersion, + //"Implementation-Vendor": "quarry authors", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +jar.finalizedBy('reobfJar') + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..29b2ac4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fb8992f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..03e1ff8 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,8 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url = 'https://maven.minecraftforge.net/' } + } +} + +rootProject.name = 'mattv' diff --git a/src/main/kotlin/de/mattv/quarry/QuarryBlock.kt b/src/main/kotlin/de/mattv/quarry/QuarryBlock.kt new file mode 100644 index 0000000..326dec2 --- /dev/null +++ b/src/main/kotlin/de/mattv/quarry/QuarryBlock.kt @@ -0,0 +1,68 @@ +package de.mattv.quarry + +import mcjty.theoneprobe.api.IProbeHitData +import mcjty.theoneprobe.api.IProbeInfo +import mcjty.theoneprobe.api.IProbeInfoAccessor +import mcjty.theoneprobe.api.ProbeMode +import net.minecraft.core.BlockPos +import net.minecraft.network.chat.TextComponent +import net.minecraft.world.InteractionHand +import net.minecraft.world.InteractionResult +import net.minecraft.world.entity.item.ItemEntity +import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.Item +import net.minecraft.world.item.ItemStack +import net.minecraft.world.level.Level +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.EntityBlock +import net.minecraft.world.level.block.SoundType +import net.minecraft.world.level.block.entity.BlockEntity +import net.minecraft.world.level.block.entity.BlockEntityTicker +import net.minecraft.world.level.block.entity.BlockEntityType +import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.material.Material +import net.minecraft.world.phys.BlockHitResult + +class QuarryBlock : Block(Properties.of(Material.STONE).sound(SoundType.METAL).strength(5.0f, 10000.0f)), EntityBlock, IProbeInfoAccessor { + override fun newBlockEntity(pos: BlockPos, state: BlockState): BlockEntity? = QuarryMod.QUARRY_TILE.get().create(pos, state) + + override fun getTicker(level: Level, state: BlockState, type: BlockEntityType): BlockEntityTicker? = + if (type == QuarryMod.QUARRY_TILE.get()) QuarryTileTicker() else null + + override fun use(state: BlockState, level: Level, pos: BlockPos, player: Player, hand: InteractionHand, result: BlockHitResult): InteractionResult { + val be = level.getBlockEntity(pos) + if (!level.isClientSide() && !player.isSecondaryUseActive && hand == InteractionHand.MAIN_HAND && player.getItemInHand(hand).isEmpty && be is QuarryTile) { + player.displayClientMessage(TextComponent(be.playerInfo()), true) + return InteractionResult.PASS + } + return super.use(state, level, pos, player, hand, result) + } + + private fun dropUpgradeItem(level: Level, pos: BlockPos, count: Int, item: Item) { + val x = pos.x.toDouble() + val y = pos.y.toDouble() + val z = pos.z.toDouble() + var toDrop = count + while (toDrop > 64) { + level.addFreshEntity(ItemEntity(level, x, y, z, ItemStack(item, 64))) + toDrop -= 64 + } + if (toDrop > 0) + level.addFreshEntity(ItemEntity(level, x, y, z, ItemStack(item, toDrop))) + } + + override fun playerDestroy(level: Level, player: Player, pos: BlockPos, state: BlockState, be: BlockEntity?, tool: ItemStack) { + if (!level.isClientSide() && be is QuarryTile) { + val toDrop = be.getUpgradesToDrop() + dropUpgradeItem(level, pos, toDrop.a, QuarryMod.QUARRY_SPEED_UPGRADE.get()) + dropUpgradeItem(level, pos, toDrop.b, QuarryMod.QUARRY_FORTUNE_UPGRADE.get()) + } + super.playerDestroy(level, player, pos, state, be, tool) + } + + override fun addProbeInfo(mode: ProbeMode?, info: IProbeInfo?, player: Player?, level: Level?, state: BlockState?, data: IProbeHitData?) { + val be = level!!.getBlockEntity(data!!.pos) + if (be is QuarryTile) + be.probeInfo(info!!) + } +} \ No newline at end of file diff --git a/src/main/kotlin/de/mattv/quarry/QuarryChunk.kt b/src/main/kotlin/de/mattv/quarry/QuarryChunk.kt new file mode 100644 index 0000000..d6a5037 --- /dev/null +++ b/src/main/kotlin/de/mattv/quarry/QuarryChunk.kt @@ -0,0 +1,34 @@ +package de.mattv.quarry + +import net.minecraft.core.BlockPos +import net.minecraft.nbt.CompoundTag + +class QuarryChunk(val x: Int, val z: Int) { + constructor(pos: BlockPos) : this( + pos.x.let { + var i = it + if (i < 0) i -= 16 + (i / 16) * 16 + }, + pos.z.let { + var i = it + if (i < 0) i -= 16 + (i / 16) * 16 + } + ) + + constructor(tag: CompoundTag) : this( + tag.getInt("x"), + tag.getInt("z") + ) + + fun save(): CompoundTag = CompoundTag().apply { + putInt("x", x) + putInt("z", z) + } + + fun asPos(): BlockPos = BlockPos(x, 0, z) + + fun min(other: QuarryChunk) = QuarryChunk(kotlin.math.min(x, other.x), kotlin.math.min(z, other.z)) + fun max(other: QuarryChunk) = QuarryChunk(kotlin.math.max(x, other.x), kotlin.math.max(z, other.z)) +} \ No newline at end of file diff --git a/src/main/kotlin/de/mattv/quarry/QuarryController.kt b/src/main/kotlin/de/mattv/quarry/QuarryController.kt new file mode 100644 index 0000000..990d2c8 --- /dev/null +++ b/src/main/kotlin/de/mattv/quarry/QuarryController.kt @@ -0,0 +1,116 @@ +package de.mattv.quarry + +import net.minecraft.core.BlockPos +import net.minecraft.nbt.CompoundTag +import net.minecraft.network.chat.Component +import net.minecraft.network.chat.TextComponent +import net.minecraft.world.InteractionHand +import net.minecraft.world.InteractionResultHolder +import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.CreativeModeTab +import net.minecraft.world.item.Item +import net.minecraft.world.item.ItemStack +import net.minecraft.world.item.TooltipFlag +import net.minecraft.world.level.ClipContext +import net.minecraft.world.level.Level + +class QuarryController : Item(Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1)) { + private var areaMode = false + private var areaModeFirstPos: QuarryChunk? = null + private var quarry: BlockPos? = null + + override fun use(level: Level, player: Player, hand: InteractionHand): InteractionResultHolder { + if (!level.isClientSide() && hand == InteractionHand.MAIN_HAND) { + val item = player.getItemInHand(hand) + load(item) + if (player.isSecondaryUseActive) { + val ray = getPlayerPOVHitResult(level, player, ClipContext.Fluid.NONE) + val block = ray.blockPos + val be = level.getBlockEntity(block) + if (be is QuarryTile) { + quarry = block + player.displayClientMessage(TextComponent("Bound controller to ${block.x}, ${block.y}, ${block.z}"), true) + save(item) + return InteractionResultHolder.success(item) + } + areaMode = !areaMode + if (!areaMode) areaModeFirstPos = null + player.displayClientMessage(TextComponent(if (areaMode) "Mode: Area" else "Mode: Single"), true) + save(item) + return InteractionResultHolder.success(item) + } else if (quarry != null) { + val be = level.getBlockEntity(quarry!!) + if (be is QuarryTile) { + val chunk = QuarryChunk(player.blockPosition()) + if (areaMode && areaModeFirstPos != null) { + val chunk1 = areaModeFirstPos!!.min(chunk) + val chunk2 = areaModeFirstPos!!.max(chunk) + var chunkCount = 0 + for (x in chunk1.x..chunk2.x step 16) for (z in chunk1.z..chunk2.z step 16) { + be.addChunk(QuarryChunk(x, z)) + chunkCount++ + } + player.displayClientMessage(TextComponent("Added $chunkCount chunks to quarry"), true) + save(item) + return InteractionResultHolder.pass(item) + } else if (areaMode) { + areaModeFirstPos = chunk + player.displayClientMessage(TextComponent("Set first position of area"), true) + save(item) + return InteractionResultHolder.pass(item) + } else { + be.addChunk(chunk) + player.displayClientMessage(TextComponent("Added chunk"), true) + save(item) + return InteractionResultHolder.pass(item) + } + } else { + player.displayClientMessage(TextComponent("Bound quarry is invalid, please rebind"), true) + quarry = null + save(item) + return InteractionResultHolder.fail(item) + } + } else { + player.displayClientMessage(TextComponent("Controller is not bound"), true) + return InteractionResultHolder.fail(item) + } + } + return super.use(level, player, hand) + } + + override fun appendHoverText(stack: ItemStack, level: Level?, tooltip: MutableList, flagIn: TooltipFlag) { + load(stack) + tooltip.add(TextComponent(if (areaMode) "Mode: Area" else "Mode: Single")) + if (areaModeFirstPos != null) + tooltip.add(TextComponent("First chunk: ${areaModeFirstPos!!.x} ${areaModeFirstPos!!.z}")) + if (quarry != null) + tooltip.add(TextComponent("Quarry: ${quarry!!.x}, ${quarry!!.y}, ${quarry!!.z}")) + super.appendHoverText(stack, level, tooltip, flagIn) + } + + private fun save(stack: ItemStack) { + val tag = CompoundTag() + tag.putBoolean("area", areaMode) + if (areaModeFirstPos != null) + tag.put("areaFirst", areaModeFirstPos!!.save()) + if (quarry != null) + tag.putIntArray("quarry", arrayListOf(quarry!!.x, quarry!!.y, quarry!!.z)) + + stack.tag = tag + } + + private fun load(stack: ItemStack) { + val tag = stack.getOrCreateTag() + if (tag.contains("area")) + areaMode = tag.getBoolean("area") + areaModeFirstPos = + if (tag.contains("areaFirst")) QuarryChunk(tag.getCompound("areaFirst")) + else null + quarry = + if (tag.contains("quarry")) { + val arr = tag.getIntArray("quarry") + BlockPos(arr[0], arr[1], arr[2]) + } + else null + } +} \ No newline at end of file diff --git a/src/main/kotlin/de/mattv/quarry/QuarryMod.kt b/src/main/kotlin/de/mattv/quarry/QuarryMod.kt new file mode 100644 index 0000000..ed3584e --- /dev/null +++ b/src/main/kotlin/de/mattv/quarry/QuarryMod.kt @@ -0,0 +1,49 @@ +package de.mattv.quarry + +import net.minecraft.world.item.BlockItem +import net.minecraft.world.item.CreativeModeTab +import net.minecraft.world.item.Item +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.entity.BlockEntityType +import net.minecraftforge.event.RegistryEvent +import net.minecraftforge.eventbus.api.SubscribeEvent +import net.minecraftforge.fml.common.Mod +import net.minecraftforge.registries.DeferredRegister +import net.minecraftforge.registries.ForgeRegistries +import net.minecraftforge.registries.RegistryObject +import thedarkcolour.kotlinforforge.forge.MOD_BUS +import thedarkcolour.kotlinforforge.forge.registerObject + +@Mod(QuarryMod.ID) +@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +object QuarryMod { + const val ID = "mquarry" + + //val LOGGER: Logger = LogManager.getLogger(ID) + + val BLOCK_REGISTRY = DeferredRegister.create(ForgeRegistries.BLOCKS, ID) + val TILES_REGISTRY = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, ID) + val ITEM_REGISTRY = DeferredRegister.create(ForgeRegistries.ITEMS, ID) + + val QUARRY_BLOCK = BLOCK_REGISTRY.registerObject("quarry", ::QuarryBlock) + val QUARRY_TILE = TILES_REGISTRY.registerObject("quarry") { BlockEntityType.Builder.of(::QuarryTile, QUARRY_BLOCK.get()).build(null) } + val QUARRY_SPEED_UPGRADE = ITEM_REGISTRY.registerObject("upgrade_speed") { QuarryUpgrade(QuarryUpgrade.Type.SPEED) } + val QUARRY_FORTUNE_UPGRADE = ITEM_REGISTRY.registerObject("upgrade_fortune") { QuarryUpgrade(QuarryUpgrade.Type.FORTUNE) } + + init { + ITEM_REGISTRY.registerObject("controller", ::QuarryController) + //LOGGER.log(Level.INFO, "MQuarry initializing") + BLOCK_REGISTRY.register(MOD_BUS) + TILES_REGISTRY.register(MOD_BUS) + ITEM_REGISTRY.register(MOD_BUS) + } + + @SubscribeEvent + fun onRegisterItems(event: RegistryEvent.Register) { + for (entry in BLOCK_REGISTRY.entries.stream().map(RegistryObject::get)) { + val item = BlockItem(entry, Item.Properties().tab(CreativeModeTab.TAB_MISC)) + item.setRegistryName(entry.registryName) + event.registry.register(item) + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/de/mattv/quarry/QuarryTile.kt b/src/main/kotlin/de/mattv/quarry/QuarryTile.kt new file mode 100644 index 0000000..5e017d2 --- /dev/null +++ b/src/main/kotlin/de/mattv/quarry/QuarryTile.kt @@ -0,0 +1,276 @@ +package de.mattv.quarry + +import com.mojang.authlib.GameProfile +import mcjty.theoneprobe.api.IProbeInfo +import net.minecraft.core.BlockPos +import net.minecraft.core.BlockPos.MutableBlockPos +import net.minecraft.core.Direction +import net.minecraft.nbt.CompoundTag +import net.minecraft.nbt.ListTag +import net.minecraft.nbt.Tag +import net.minecraft.network.chat.TextComponent +import net.minecraft.network.protocol.Packet +import net.minecraft.network.protocol.game.ClientGamePacketListener +import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket +import net.minecraft.server.level.ServerLevel +import net.minecraft.util.Tuple +import net.minecraft.world.InteractionHand +import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.ItemStack +import net.minecraft.world.item.Items +import net.minecraft.world.item.enchantment.Enchantments +import net.minecraft.world.level.Level +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.Blocks +import net.minecraft.world.level.block.entity.BlockEntity +import net.minecraft.world.level.block.entity.BlockEntityTicker +import net.minecraft.world.level.block.state.BlockState +import net.minecraftforge.common.MinecraftForge +import net.minecraftforge.common.capabilities.Capability +import net.minecraftforge.common.capabilities.ICapabilityProvider +import net.minecraftforge.common.util.FakePlayer +import net.minecraftforge.common.util.FakePlayerFactory +import net.minecraftforge.common.util.LazyOptional +import net.minecraftforge.energy.CapabilityEnergy +import net.minecraftforge.energy.IEnergyStorage +import net.minecraftforge.event.world.BlockEvent +import net.minecraftforge.items.CapabilityItemHandler +import net.minecraftforge.items.ItemHandlerHelper +import java.util.* +import kotlin.math.max +import kotlin.math.min +import kotlin.math.pow +import kotlin.streams.asSequence + +object FakeQuarryPlayer { + private val profile = GameProfile(UUID.fromString("21a819e9-a98d-4e58-bd52-f60b9570a918"), "[MQuarry]") + fun get(level: ServerLevel): FakePlayer = FakePlayerFactory.get(level, profile) +} + +class QuarryTileTicker : BlockEntityTicker { + override fun tick(level: Level, pos: BlockPos, state: BlockState, be: T) { + if (level.isClientSide()) return + val tile = be as QuarryTile + tile.tick(level) + } +} + +class QuarryTile(private val myPos: BlockPos, state: BlockState) : BlockEntity(QuarryMod.QUARRY_TILE.get(), myPos, state), IEnergyStorage, ICapabilityProvider { + private var energyStored: Int = 0 + private var speedLevel: Int = 0 + private var fortuneLevel: Int = 0 + private var speedUpgradesNeeded: Int = 1 + private var fortuneUpgradesNeeded: Int = 1 + private var itemsToDrop: MutableList = ArrayList() + private var curPos: MutableBlockPos = MutableBlockPos(0, myPos.y - 1, 0) + private var curChunk: QuarryChunk? = null + private var chunksTodo: MutableList = ArrayList() + + override fun receiveEnergy(maxReceive: Int, simulate: Boolean): Int { + val recv = min(QUARRY_MAX_ENERGY - energyStored, maxReceive) + if (!simulate) + energyStored += recv + return recv + } + + override fun extractEnergy(maxExtract: Int, simulate: Boolean): Int { + return 0 + } + + override fun getEnergyStored(): Int { + return energyStored + } + + override fun getMaxEnergyStored(): Int { + return QUARRY_MAX_ENERGY + } + + override fun canExtract(): Boolean { + return false + } + + override fun canReceive(): Boolean { + return true + } + + override fun getCapability(cap: Capability, side: Direction?): LazyOptional { + if (cap == CapabilityEnergy.ENERGY) return LazyOptional.of { this as T } + return super.getCapability(cap, side) + } + + private fun getPickaxe(): ItemStack = Items.NETHERITE_PICKAXE.defaultInstance.apply { + if (fortuneLevel > 0) enchant(Enchantments.BLOCK_FORTUNE, fortuneLevel) + } + + private fun breakBlock(level: Level, pos: BlockPos): Boolean { + val state = level.getBlockState(pos) + val pickaxe = getPickaxe() + val player = FakeQuarryPlayer.get(level as ServerLevel) + player.setItemInHand(InteractionHand.MAIN_HAND, pickaxe) + val event = BlockEvent.BreakEvent(level, pos, state, player) + MinecraftForge.EVENT_BUS.post(event) + if (event.isCanceled) return true + if (state.isAir) return true + if (state.getDestroySpeed(level, pos) < 0) return true + val energyNeeded = ENERGY_BASE + max(0, (state.getDestroySpeed(level, pos) * ENERGY_PER_STRENGTH).toInt()) + if (energyStored < energyNeeded) return false + energyStored -= energyNeeded + if (level.getFluidState(pos).isEmpty) // Is not a liquid + itemsToDrop.addAll(Block.getDrops(state, level, pos, level.getBlockEntity(pos), player, pickaxe)) + level.setBlock(pos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL) + setChanged() + return true + } + + private fun newChunk() { + curChunk = chunksTodo.removeFirstOrNull() + } + + fun tick(level: Level) { + // Mine + if (curChunk == null) newChunk() + if (itemsToDrop.isEmpty() && curChunk != null) { + var curChunkPos = curChunk!!.asPos() + for (i in 0..speedLevel) { + if (!breakBlock(level, curChunkPos.offset(curPos))) break + curPos.x++ + if (curPos.x == 16) { + curPos.x = 0 + curPos.z++ + } + if (curPos.z == 16) { + curPos.z = 0 + curPos.y-- + } + if (curPos.y == level.minBuildHeight - 1) { + curPos.y = myPos.y - 1 + newChunk() + if (curChunk == null) break + curChunkPos = curChunk!!.asPos() + } + } + } + + if (itemsToDrop.isEmpty()) return + // Drop items + val te = level.getBlockEntity(myPos.offset(0, 1, 0)) ?: return + val itemHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).orElse(null) ?: return + val newDrops = ArrayList() + for (drop in itemsToDrop) { + val newDrop = ItemHandlerHelper.insertItemStacked(itemHandler, drop, false) + if (!newDrop.isEmpty) newDrops.add(newDrop) + } + itemsToDrop = newDrops + setChanged() + } + + fun playerInfo(): String = "Speed: $speedLevel, needed: $speedUpgradesNeeded | Fortune: $fortuneLevel, needed: $fortuneUpgradesNeeded | " + if (curChunk != null) "Chunks in queue: ${chunksTodo.size}" else "Idle" + + fun useUpgrade(player: Player, stack: ItemStack) { + val item = stack.item as QuarryUpgrade + if (item.ty == QuarryUpgrade.Type.SPEED) { + val used = min(stack.count, speedUpgradesNeeded) + stack.shrink(used) + speedUpgradesNeeded -= used + if (speedUpgradesNeeded == 0) { + speedLevel++ + speedUpgradesNeeded = (2.0).pow(speedLevel).toInt() + player.displayClientMessage(TextComponent("New speed level: $speedLevel, upgrades needed for next level: $speedUpgradesNeeded"), true) + } else + player.displayClientMessage(TextComponent("Upgrades needed for next level: $speedUpgradesNeeded"), true) + } else { + val used = min(stack.count, fortuneUpgradesNeeded) + stack.shrink(used) + fortuneUpgradesNeeded -= used + if (fortuneUpgradesNeeded == 0) { + fortuneLevel++ + fortuneUpgradesNeeded = (2.0).pow(fortuneLevel).toInt() + player.displayClientMessage(TextComponent("New fortune level: $fortuneLevel, upgrades needed for next level: $fortuneUpgradesNeeded"), true) + } else + player.displayClientMessage(TextComponent("Upgrades needed for next level: $fortuneUpgradesNeeded"), true) + } + } + + fun getUpgradesToDrop() : Tuple { + var speed = (2.0).pow(speedLevel).toInt() - speedUpgradesNeeded + for (i in 1..speedLevel) speed += (2.0).pow(i-1).toInt() + var fortune = (2.0).pow(fortuneLevel).toInt() - fortuneUpgradesNeeded + for (i in 1..fortuneLevel) fortune += (2.0).pow(i-1).toInt() + return Tuple(speed, fortune) + } + + fun addChunk(chunk: QuarryChunk) = chunksTodo.add(chunk) + + private fun saveClientData(tag: CompoundTag) { + tag.putInt("energy", energyStored) + tag.putInt("speedLevel", speedLevel) + tag.putInt("fortuneLevel", fortuneLevel) + tag.putInt("speedUpgradesNeeded", speedUpgradesNeeded) + tag.putInt("fortuneUpgradesNeeded", fortuneUpgradesNeeded) + } + + override fun saveAdditional(tag: CompoundTag) { + saveClientData(tag) + val dropsList = ListTag() + itemsToDrop.stream().forEach { + val itemTag = CompoundTag() + it.save(itemTag) + dropsList.add(itemTag) + } + tag.put("drops", dropsList) + tag.putInt("curPosX", curPos.x) + tag.putInt("curPosY", curPos.y) + tag.putInt("curPosZ", curPos.z) + if (curChunk != null) { + tag.put("curChunk", curChunk!!.save()) + } + val chunkList = ListTag() + chunkList.addAll(chunksTodo.stream().map(QuarryChunk::save).asSequence()) + tag.put("chunks", chunkList) + } + + override fun load(tag: CompoundTag) { + energyStored = tag.getInt("energy") + speedLevel = tag.getInt("speedLevel") + fortuneLevel = tag.getInt("fortuneLevel") + speedUpgradesNeeded = tag.getInt("speedUpgradesNeeded") + fortuneUpgradesNeeded = tag.getInt("fortuneUpgradesNeeded") + if (!tag.contains("drops")) return // Everything after this is server only + itemsToDrop = tag.getList("drops", Tag.TAG_COMPOUND.toInt()) + .map { ItemStack.of(it as CompoundTag) }.toMutableList() + curPos.x = tag.getInt("curPosX") + curPos.y = tag.getInt("curPosY") + curPos.z = tag.getInt("curPosZ") + curChunk = if (tag.contains("curChunk")) QuarryChunk(tag.get("curChunk") as CompoundTag) else null + chunksTodo = tag.getList("chunks", CompoundTag.TAG_COMPOUND.toInt()) + .map { QuarryChunk(it as CompoundTag) }.toMutableList() + } + + override fun getUpdateTag(): CompoundTag { + val tag = CompoundTag() + saveClientData(tag) + return tag + } + + override fun getUpdatePacket(): Packet? = ClientboundBlockEntityDataPacket.create(this) + + fun probeInfo(info: IProbeInfo) { + val speedMax = (2.0).pow(speedLevel).toInt() + info.text("Speed: level $speedLevel, ${speedMax - speedUpgradesNeeded}/$speedMax") + val fortuneMax = (2.0).pow(fortuneLevel).toInt() + info.text("Fortune: level $fortuneLevel, ${fortuneMax - fortuneUpgradesNeeded}/$fortuneMax") + if (itemsToDrop.isNotEmpty()) + info.text("Waiting to extract items...") + else if (curChunk != null) { + val pos = curChunk!!.asPos().offset(curPos) + info.text("Currently mining: ${pos.x} ${pos.y} ${pos.z}") + info.text("Chunks in queue: ${chunksTodo.size}") + } else info.text("Idle") + } + + companion object { + const val QUARRY_MAX_ENERGY: Int = 100_000_000 + const val ENERGY_BASE = 1000 + const val ENERGY_PER_STRENGTH = 500 + } +} \ No newline at end of file diff --git a/src/main/kotlin/de/mattv/quarry/QuarryUpgrade.kt b/src/main/kotlin/de/mattv/quarry/QuarryUpgrade.kt new file mode 100644 index 0000000..78384e8 --- /dev/null +++ b/src/main/kotlin/de/mattv/quarry/QuarryUpgrade.kt @@ -0,0 +1,20 @@ +package de.mattv.quarry + +import net.minecraft.world.InteractionHand +import net.minecraft.world.InteractionResult +import net.minecraft.world.item.CreativeModeTab +import net.minecraft.world.item.Item +import net.minecraft.world.item.context.UseOnContext + +class QuarryUpgrade(val ty: Type) : Item(Properties().tab(CreativeModeTab.TAB_MISC)) { + enum class Type { SPEED, FORTUNE } + + override fun useOn(ctx: UseOnContext): InteractionResult { + val be = ctx.level.getBlockEntity(ctx.clickedPos) + if (!ctx.level.isClientSide() && ctx.hand == InteractionHand.MAIN_HAND && be is QuarryTile) { + be.useUpgrade(ctx.player!!, ctx.itemInHand) + return InteractionResult.CONSUME + } + return super.useOn(ctx) + } +} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..77d85f6 --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,58 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="kotlinforforge" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="[3,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="GNU GPL 3.0" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="mquarry" #mandatory +# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it +# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata +# see the associated build.gradle script for how to populate this completely automatically during a build +version="${file.jarVersion}" #mandatory +# A display name for the mod +displayName="MQuarry" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="mattv.png" #optional +# A text field displayed in the mod UI +#credits="Thanks for this example mod goes to Java" #optional +# A text field displayed in the mod UI +#authors="Love, Cheese and small house plants" #optional +# The description text for the mod (multi line!) (#mandatory) +description=''' + +''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.mquarry]] #optional + # the modid of the dependency + modId="forge" #mandatory + # Does this dependency have to exist - if not, ordering below must be specified + mandatory=true #mandatory + # The version range of the dependency + versionRange="[40,)" #mandatory + # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory + ordering="NONE" + # Side this dependency is applied on - BOTH, CLIENT or SERVER + side="BOTH" +# Here's another dependency +[[dependencies.mquarry]] + modId="minecraft" + mandatory=true + # This version range declares a minimum of the current minecraft version up to but not including the next major version + versionRange="[1.18.2,1.19)" + ordering="NONE" + side="BOTH" diff --git a/src/main/resources/assets/mquarry/blockstates/quarry.json b/src/main/resources/assets/mquarry/blockstates/quarry.json new file mode 100644 index 0000000..9af0a8a --- /dev/null +++ b/src/main/resources/assets/mquarry/blockstates/quarry.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "mquarry:block/quarry" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/lang/en_us.json b/src/main/resources/assets/mquarry/lang/en_us.json new file mode 100755 index 0000000..155a98a --- /dev/null +++ b/src/main/resources/assets/mquarry/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "block.mquarry.quarry": "MQuarry", + + "item.mquarry.upgrade_speed": "MQuarry speed upgrade", + "item.mquarry.upgrade_fortune": "MQuarry fortune upgrade", + "item.mquarry.controller": "MQuarry controller" +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/models/block/quarry.json b/src/main/resources/assets/mquarry/models/block/quarry.json new file mode 100644 index 0000000..6bbe9ed --- /dev/null +++ b/src/main/resources/assets/mquarry/models/block/quarry.json @@ -0,0 +1,11 @@ +{ + "parent": "block/cube_all", + "textures": { + "up": "mquarry:blocks/quarry/updown", + "down": "mquarry:blocks/quarry/updown", + "north": "mquarry:blocks/quarry/side", + "south": "mquarry:blocks/quarry/side", + "west": "mquarry:blocks/quarry/side", + "east": "mquarry:blocks/quarry/side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/models/item/controller.json b/src/main/resources/assets/mquarry/models/item/controller.json new file mode 100644 index 0000000..5d8f9dd --- /dev/null +++ b/src/main/resources/assets/mquarry/models/item/controller.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "mquarry:items/controller" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/models/item/quarry.json b/src/main/resources/assets/mquarry/models/item/quarry.json new file mode 100644 index 0000000..509b868 --- /dev/null +++ b/src/main/resources/assets/mquarry/models/item/quarry.json @@ -0,0 +1,3 @@ +{ + "parent": "mquarry:block/quarry" +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/models/item/upgrade_fortune.json b/src/main/resources/assets/mquarry/models/item/upgrade_fortune.json new file mode 100644 index 0000000..b3e0383 --- /dev/null +++ b/src/main/resources/assets/mquarry/models/item/upgrade_fortune.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "mquarry:items/upgrade_fortune" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/models/item/upgrade_speed.json b/src/main/resources/assets/mquarry/models/item/upgrade_speed.json new file mode 100644 index 0000000..4f875f3 --- /dev/null +++ b/src/main/resources/assets/mquarry/models/item/upgrade_speed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "mquarry:items/upgrade_speed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mquarry/textures/blocks/quarry/side.png b/src/main/resources/assets/mquarry/textures/blocks/quarry/side.png new file mode 100755 index 0000000..22d32e9 Binary files /dev/null and b/src/main/resources/assets/mquarry/textures/blocks/quarry/side.png differ diff --git a/src/main/resources/assets/mquarry/textures/blocks/quarry/updown.png b/src/main/resources/assets/mquarry/textures/blocks/quarry/updown.png new file mode 100755 index 0000000..516a1bc Binary files /dev/null and b/src/main/resources/assets/mquarry/textures/blocks/quarry/updown.png differ diff --git a/src/main/resources/assets/mquarry/textures/items/controller.png b/src/main/resources/assets/mquarry/textures/items/controller.png new file mode 100644 index 0000000..a7519f3 Binary files /dev/null and b/src/main/resources/assets/mquarry/textures/items/controller.png differ diff --git a/src/main/resources/assets/mquarry/textures/items/upgrade_fortune.png b/src/main/resources/assets/mquarry/textures/items/upgrade_fortune.png new file mode 100644 index 0000000..e66d0e1 Binary files /dev/null and b/src/main/resources/assets/mquarry/textures/items/upgrade_fortune.png differ diff --git a/src/main/resources/assets/mquarry/textures/items/upgrade_speed.png b/src/main/resources/assets/mquarry/textures/items/upgrade_speed.png new file mode 100644 index 0000000..2daff5d Binary files /dev/null and b/src/main/resources/assets/mquarry/textures/items/upgrade_speed.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..fc248a9 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mquarry:quarry" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json new file mode 100644 index 0000000..fc248a9 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "mquarry:quarry" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/mquarry/loot_tables/blocks/quarry.json b/src/main/resources/data/mquarry/loot_tables/blocks/quarry.json new file mode 100644 index 0000000..28196c4 --- /dev/null +++ b/src/main/resources/data/mquarry/loot_tables/blocks/quarry.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "entries": [ + { + "type": "minecraft:item", + "name": "mquarry:quarry" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..cbf8842 --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": "mquarry resources", + "pack_format": 8 + ,"forge:resource_pack_format": 8 + ,"forge:data_pack_format": 9 + } +}