diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ed4f50..2ca3795 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,22 +1,40 @@ -name: Build +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. -on: [push] +name: build +on: [pull_request, push] jobs: build: - - runs-on: ubuntu-latest - - container: - image: openjdk:17-jdk - options: --user root - + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + ] + # and run on both Linux and Windows + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2.2.0 - - run: | - chmod +x ./gradlew - ./gradlew build - - uses: actions/upload-artifact@v2 - with: - name: build-artifacts - path: build/libs/ \ No newline at end of file + - name: checkout repository + uses: actions/checkout@v3 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS + uses: actions/upload-artifact@v3 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3c37caf..c476faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,118 +1,40 @@ -# User-specific stuff -.idea/ - -*.iml -*.ipr -*.iws +# gradle -# IntelliJ +.gradle/ +build/ out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory +classes/ -# Linux trash folder which might appear on any partition or disk -.Trash-* +# eclipse -# .nfs files are created when an open file is removed but is still being accessed -.nfs* +*.launch -# General -.DS_Store -.AppleDouble -.LSOverride +# idea -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp +.idea/ +*.iml +*.ipr +*.iws -# Windows shortcuts -*.lnk +# vscode -.gradle -build/ +.settings/ +.vscode/ +bin/ +.classpath +.project -# Ignore Gradle GUI config -gradle-app.setting +# macos -# Cache of project -.gradletasknamecache +*.DS_Store -**/build/ +# fabric -# Common working directory run/ -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE index a612ad9..1625c17 100644 --- a/LICENSE +++ b/LICENSE @@ -1,373 +1,121 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ff275d3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'fabric-loom' version '1.3-SNAPSHOT' + id 'maven-publish' + id "org.jetbrains.kotlin.jvm" version "1.9.0" +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = 17 + } +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} + +loom { + accessWidenerPath = file("src/main/resources/accuratemaps.accesswidener") +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 79c1824..0e438d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,31 +1,17 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx4G +org.gradle.parallel=true -# Gradle Plugins -kotlin_version=1.7.10 -loom_version=0.12-SNAPSHOT -grgit_version=4.1.0 -cursegradle_version=1.4.0 -modrinth_version=1.2.0 -github_api_version=1.114 +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.22 # Mod Properties -mod_version=1.1-BETA+1.19 +mod_version=1.2-BETA+1.20.1 maven_group=io.github.lucaargolo - -# Fabric Properties -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.3 -loader_version=0.14.9 - -#Fabric api -fabric_version=0.59.0+1.19.2 -fabric_kotlin_version=1.8.2+kotlin.1.7.10 - -# Libraries -modmenu_version=4.0.6 -rei_version=9.1.526 - -# Publishing -curseforge_id=667863 -modrinth_id=cXMrEM6i \ No newline at end of file +archives_base_name=accuratemaps +# Dependencies +fabric_version=0.86.1+1.20.1 +fabric_kotlin_version=1.10.8+kotlin.1.9.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..62f495d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..fcb6fca 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# 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" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +129,120 @@ 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. + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# 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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# 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/gradlew.bat b/gradlew.bat index 5093609..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +65,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,17 +72,19 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%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%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/io/github/lucaargolo/accuratemaps/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/io/github/lucaargolo/accuratemaps/mixin/ClientPlayNetworkHandlerMixin.java index d8934f2..78caa65 100644 --- a/src/main/java/io/github/lucaargolo/accuratemaps/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/io/github/lucaargolo/accuratemaps/mixin/ClientPlayNetworkHandlerMixin.java @@ -1,5 +1,6 @@ package io.github.lucaargolo.accuratemaps.mixin; +import io.github.lucaargolo.accuratemaps.client.AccurateMapsClient; import io.github.lucaargolo.accuratemaps.client.AccurateMapsClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.packet.s2c.play.MapUpdateS2CPacket; diff --git a/src/main/java/io/github/lucaargolo/accuratemaps/mixin/FilledMapItemMixin.java b/src/main/java/io/github/lucaargolo/accuratemaps/mixin/FilledMapItemMixin.java index 44ec1ff..8c3a631 100644 --- a/src/main/java/io/github/lucaargolo/accuratemaps/mixin/FilledMapItemMixin.java +++ b/src/main/java/io/github/lucaargolo/accuratemaps/mixin/FilledMapItemMixin.java @@ -2,6 +2,7 @@ import com.google.common.collect.Multiset; import io.github.lucaargolo.accuratemaps.utils.AccurateMapState; +import io.github.lucaargolo.accuratemaps.utils.AccurateMapState; import net.minecraft.block.MapColor; import net.minecraft.entity.Entity; import net.minecraft.item.FilledMapItem; @@ -11,6 +12,7 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.chunk.WorldChunk; +import net.minecraft.util.math.BlockPos; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -32,8 +34,8 @@ public void captureAccurateMapState(ItemStack stack, World world, Entity entity, } } - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/item/map/MapState;putColor(IIB)Z"), method = "updateColors", locals = LocalCapture.CAPTURE_FAILSOFT) - public void updateAccurateMapState(World world, Entity entity, MapState state, CallbackInfo ci, int i, int j, int k, int l, int m, int n, MapState.PlayerUpdateTracker playerUpdateTracker, boolean bl, int o, double d, int p, int q, int r, boolean bl2, int s, int t, Multiset multiset, WorldChunk worldChunk, ChunkPos chunkPos, int u, int v, int w, double e, MapColor mapColor, MapColor.Brightness brightness) { + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/item/map/MapState;putColor(IIB)Z"), method = "updateColors", locals = LocalCapture.CAPTURE_FAILHARD) + public void updateAccurateMapState(World world, Entity entity, MapState state, CallbackInfo ci, int i, int j, int k, int l, int m, int n, MapState.PlayerUpdateTracker playerUpdateTracker, BlockPos.Mutable pos1, BlockPos.Mutable pos2, boolean bl, int o, double d, int p, int r, boolean bl2, int s, int t, Multiset multiset, WorldChunk worldChunk, int u, double e, MapColor mapColor, MapColor.Brightness brightness) { currentState.setBlock(o, p, mapColor); } diff --git a/src/main/java/io/github/lucaargolo/accuratemaps/mixin/MapTextureMixin.java b/src/main/java/io/github/lucaargolo/accuratemaps/mixin/MapTextureMixin.java index cf1c38c..8c8ca97 100644 --- a/src/main/java/io/github/lucaargolo/accuratemaps/mixin/MapTextureMixin.java +++ b/src/main/java/io/github/lucaargolo/accuratemaps/mixin/MapTextureMixin.java @@ -2,6 +2,7 @@ import io.github.lucaargolo.accuratemaps.client.AccurateMapsClient; import io.github.lucaargolo.accuratemaps.utils.AccurateMapState; +import io.github.lucaargolo.accuratemaps.utils.AccurateMapState; import net.minecraft.client.render.MapRenderer; import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.item.map.MapState; diff --git a/src/main/kotlin/io/github/lucaargolo/accuratemaps/AccurateMaps.kt b/src/main/kotlin/io/github/lucaargolo/accuratemaps/AccurateMaps.kt index 73b987f..d04e5ef 100644 --- a/src/main/kotlin/io/github/lucaargolo/accuratemaps/AccurateMaps.kt +++ b/src/main/kotlin/io/github/lucaargolo/accuratemaps/AccurateMaps.kt @@ -9,22 +9,22 @@ import net.minecraft.util.Identifier object AccurateMaps: ModInitializer { - const val MOD_ID = "accuratemaps" - val REQUEST_ACCURATE_MAP = Identifier(MOD_ID, "request_accurate_map") - val RECEIVE_ACCURATE_MAP = Identifier(MOD_ID, "receive_accurate_map") + const val MOD_ID = "accuratemaps" + val REQUEST_ACCURATE_MAP = Identifier(MOD_ID, "request_accurate_map") + val RECEIVE_ACCURATE_MAP = Identifier(MOD_ID, "receive_accurate_map") - override fun onInitialize() { - ServerPlayNetworking.registerGlobalReceiver(REQUEST_ACCURATE_MAP) { server, player, _, outerBuf, _ -> - val id = outerBuf.readInt() - server.execute { - val accurateMapState = player.server.overworld.persistentStateManager.getOrCreate(AccurateMapState::createFromNbt, ::AccurateMapState, "accurate_map_$id") - val nbt = accurateMapState.writeClientNbt(NbtCompound()) - val innerBuf = PacketByteBufs.create() - innerBuf.writeInt(id) - innerBuf.writeNbt(nbt) - ServerPlayNetworking.send(player, RECEIVE_ACCURATE_MAP, innerBuf) - } - } - } + override fun onInitialize() { + ServerPlayNetworking.registerGlobalReceiver(REQUEST_ACCURATE_MAP) { server, player, _, outerBuf, _ -> + val id = outerBuf.readInt() + server.execute { + val accurateMapState = player.server.overworld.persistentStateManager.getOrCreate(AccurateMapState::createFromNbt, ::AccurateMapState, "accurate_map_$id") + val nbt = accurateMapState.writeClientNbt(NbtCompound()) + val innerBuf = PacketByteBufs.create() + innerBuf.writeInt(id) + innerBuf.writeNbt(nbt) + ServerPlayNetworking.send(player, RECEIVE_ACCURATE_MAP, innerBuf) + } + } + } } \ No newline at end of file diff --git a/src/main/kotlin/io/github/lucaargolo/accuratemaps/client/AccurateMapsClient.kt b/src/main/kotlin/io/github/lucaargolo/accuratemaps/client/AccurateMapsClient.kt index 10ed4c1..45ec84e 100644 --- a/src/main/kotlin/io/github/lucaargolo/accuratemaps/client/AccurateMapsClient.kt +++ b/src/main/kotlin/io/github/lucaargolo/accuratemaps/client/AccurateMapsClient.kt @@ -20,7 +20,7 @@ import net.minecraft.network.packet.s2c.play.MapUpdateS2CPacket import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Direction import net.minecraft.util.math.random.Random -import net.minecraft.util.registry.Registry +import net.minecraft.registry.Registries import net.minecraft.world.biome.BiomeKeys import org.lwjgl.opengl.GL11 import java.lang.Float.min @@ -35,7 +35,8 @@ object AccurateMapsClient: ClientModInitializer { private val blockColorMap = linkedMapOf() fun paintBlockColorMap(client: MinecraftClient) { - val atlas = client.bakedModelManager.blockModels.getModel(Blocks.STONE.defaultState).particleSprite.atlas + val atlasId = client.bakedModelManager.blockModels.getModel(Blocks.STONE.defaultState).particleSprite.atlasId + val atlas = client.getTextureManager().getTexture(atlasId) RenderSystem.bindTexture(atlas.glId) val width = intArrayOf(0) GL11.glGetTexLevelParameteriv(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH, width) @@ -45,7 +46,7 @@ object AccurateMapsClient: ClientModInitializer { val buffer: ByteBuffer = ByteBuffer.allocateDirect(pixels.size) GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, buffer) buffer.get(pixels) - Registry.BLOCK.forEach { block -> + Registries.BLOCK.forEach { block -> block.stateManager.states.forEach { state -> val blockModel = client.bakedModelManager.blockModels.getModel(state) val blockSprite = blockModel.getQuads(state, Direction.UP, Random.create()).firstOrNull()?.sprite ?: blockModel.particleSprite diff --git a/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapColor.kt b/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapColor.kt index ca5586d..5db990f 100644 --- a/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapColor.kt +++ b/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapColor.kt @@ -4,7 +4,7 @@ import io.github.lucaargolo.accuratemaps.mixin.MapColorInvoker import net.minecraft.block.BlockState import net.minecraft.block.MapColor import net.minecraft.util.math.BlockPos -import net.minecraft.util.registry.RegistryKey +import net.minecraft.registry.RegistryKey import net.minecraft.world.biome.Biome class AccurateMapColor : MapColor { diff --git a/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapRenderView.kt b/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapRenderView.kt index e62ace2..77bfad7 100644 --- a/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapRenderView.kt +++ b/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapRenderView.kt @@ -7,17 +7,20 @@ import net.minecraft.block.entity.BlockEntity import net.minecraft.fluid.FluidState import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Direction -import net.minecraft.util.registry.Registry +import net.minecraft.registry.RegistryKeys import net.minecraft.world.BlockRenderView import net.minecraft.world.World import net.minecraft.world.biome.BiomeKeys import net.minecraft.world.chunk.ChunkProvider import net.minecraft.world.chunk.light.LightingProvider -import net.minecraft.world.level.ColorResolver +import net.minecraft.world.biome.ColorResolver +import net.minecraft.world.chunk.light.ChunkSkyLight +import net.minecraft.world.chunk.light.LightSourceView +import java.util.function.BiConsumer -class AccurateMapRenderView(private val accurateMapState: AccurateMapState, val world: World): BlockRenderView { +class AccurateMapRenderView(private val accurateMapState: AccurateMapState, val world: World): BlockRenderView, LightSourceView { - private val lightningProvider = LightingProvider(AccurateMapRenderViewChunkProvider(), true, true) + private val lightingProvider = LightingProvider(AccurateMapRenderViewChunkProvider(), true, true) private val colorCache = mutableMapOf() override fun getHeight() = world.height @@ -33,20 +36,28 @@ class AccurateMapRenderView(private val accurateMapState: AccurateMapState, val override fun getFluidState(pos: BlockPos): FluidState = getBlockState(pos).fluidState + override fun forEachLightSource(callback: BiConsumer?) { + TODO("Not yet implemented") + } + + override fun getChunkSkyLight(): ChunkSkyLight { + TODO("Not yet implemented") + } + override fun getBrightness(direction: Direction?, shaded: Boolean) = 1f - override fun getLightingProvider() = lightningProvider + override fun getLightingProvider() = lightingProvider override fun getColor(pos: BlockPos, colorResolver: ColorResolver): Int { return colorCache.getOrPut(pos) { val index = accurateMapState.positions.indexOf(pos.asLong()) - val biome = world.registryManager.get(Registry.BIOME_KEY).get(if (index == -1) BiomeKeys.FOREST else accurateMapState.biomesPalette[accurateMapState.biomes[index]]) + val biome = world.registryManager.get(RegistryKeys.BIOME).get(if (index == -1) BiomeKeys.FOREST else accurateMapState.biomesPalette[accurateMapState.biomes[index]]) colorResolver.getColor(biome, pos.x + 0.5, pos.z + 0.5) } } private inner class AccurateMapRenderViewChunkProvider: ChunkProvider { - override fun getChunk(chunkX: Int, chunkZ: Int) = this@AccurateMapRenderView + override fun getChunk(chunkX: Int, chunkZ: Int): LightSourceView = this@AccurateMapRenderView override fun getWorld() = this@AccurateMapRenderView } diff --git a/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapState.kt b/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapState.kt index 9cdeb86..fdbceae 100644 --- a/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapState.kt +++ b/src/main/kotlin/io/github/lucaargolo/accuratemaps/utils/AccurateMapState.kt @@ -9,8 +9,8 @@ import net.minecraft.block.MapColor import net.minecraft.nbt.* import net.minecraft.util.Identifier import net.minecraft.util.math.BlockPos -import net.minecraft.util.registry.Registry -import net.minecraft.util.registry.RegistryKey +import net.minecraft.registry.RegistryKeys +import net.minecraft.registry.RegistryKey import net.minecraft.world.PersistentState import net.minecraft.world.biome.Biome import net.minecraft.world.biome.BiomeKeys @@ -55,9 +55,9 @@ class AccurateMapState(startLists: Boolean = true): PersistentState() { } }) nbt.put("statesPalette", NbtIntArray( - statesPalette.map { state -> - Block.getRawIdFromState(state) - }.toIntArray() + statesPalette.map { state -> + Block.getRawIdFromState(state) + }.toIntArray() )) nbt.put("biomes", NbtIntArray(biomes)) nbt.put("states", NbtIntArray(states)) @@ -67,7 +67,7 @@ class AccurateMapState(startLists: Boolean = true): PersistentState() { fun readClientNbt(nbt: NbtCompound) { (nbt.get("biomesPalette") as? NbtList)?.forEachIndexed { index, element -> - biomesPalette.add(index, RegistryKey.of(Registry.BIOME_KEY, Identifier(element.asString()))) + biomesPalette.add(index, RegistryKey.of(RegistryKeys.BIOME, Identifier(element.asString()))) } nbt.getIntArray("statesPalette").forEachIndexed { index, id -> statesPalette.add(index, Block.getStateFromRawId(id)) @@ -112,7 +112,7 @@ class AccurateMapState(startLists: Boolean = true): PersistentState() { fun createFromNbt(nbt: NbtCompound): AccurateMapState { return AccurateMapState(false).also { (nbt.get("biomesPalette") as? NbtList)?.forEachIndexed { index, element -> - it.biomesPalette.add(index, RegistryKey.of(Registry.BIOME_KEY, Identifier(element.asString()))) + it.biomesPalette.add(index, RegistryKey.of(RegistryKeys.BIOME, Identifier(element.asString()))) } (nbt.get("statesPalette") as? NbtList)?.forEachIndexed { index, element -> it.statesPalette.add(index, BlockState.CODEC.decode(NbtOps.INSTANCE, element).getOrThrow(true) {}.first) diff --git a/src/main/resources/accuratemaps.mixins.json b/src/main/resources/accuratemaps.mixins.json new file mode 100644 index 0000000..18088a5 --- /dev/null +++ b/src/main/resources/accuratemaps.mixins.json @@ -0,0 +1,20 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "io.github.lucaargolo.accuratemaps.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "AbstractBlockStateMixin", + "FilledMapItemMixin", + "MapColorInvoker", + "MapColorInvoker$BrightnessInvoker" + ], + "client": [ + "ClientPlayNetworkHandlerMixin", + "MapTextureMixin", + "MinecraftClientMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c5c3179..77ea8c6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,42 +1,45 @@ { - "schemaVersion": 1, - "id": "accuratemaps", - "version": "${version}", - "name": "Accurate Maps", - "description": "A small quality of life mod that changes the vanilla map coloring to be more accurate to in-game colors.", - "authors": [ - "D4rkness_King" - ], - "contact": { - "homepage": "https://modrinth.com/mod/accurate-maps", - "sources": "https://github.com/lucaargolo/accurate-maps", - "issues": "https://github.com/lucaargolo/accurate-maps/issues" - }, - "license": "Mozilla Public License 2.0", - "icon": "assets/accuratemaps/icon.png", - "environment": "*", - "entrypoints": { - "client": [ - { - "value": "io.github.lucaargolo.accuratemaps.client.AccurateMapsClient", - "adapter": "kotlin" - } - ], - "main": [ - { - "value": "io.github.lucaargolo.accuratemaps.AccurateMaps", - "adapter": "kotlin" - } - ] - }, - "mixins": [ - "accuratemaps.mixin.json" - ], - "accessWidener": "accuratemaps.accesswidener", - "depends": { - "fabricloader": ">=0.14.8", - "fabric": ">=0.56.0+1.19", - "fabric-language-kotlin": ">=1.8.0+kotlin.1.7.0", - "minecraft": "1.19.x" - } -} + "schemaVersion": 1, + "id": "accuratemaps", + "version": "${version}", + "name": "Accurate Maps", + "description": "A small quality of life mod that changes the vanilla map coloring to be more accurate to in-game colors.", + "authors": [ + "D4rkness_King" + ], + "contact": { + "homepage": "https://modrinth.com/mod/accurate-maps", + "sources": "https://github.com/lucaargolo/accurate-maps", + "issues": "https://github.com/lucaargolo/accurate-maps/issues" + }, + "license": "Mozilla Public License 2.0", + "icon": "assets/accuratemaps/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + { + "value": "io.github.lucaargolo.accuratemaps.client.AccurateMapsClient", + "adapter": "kotlin" + } + ], + "main": [ + { + "value": "io.github.lucaargolo.accuratemaps.AccurateMaps", + "adapter": "kotlin" + } + ] + }, + "mixins": [ + "accuratemaps.mixins.json" + ], + "depends": { + "fabricloader": ">=0.14.22", + "minecraft": "~1.20.1", + "java": ">=17", + "fabric-api": "*", + "fabric-language-kotlin": ">=1.9.0" + }, + "loom": { + "accessWidener": "accuratemaps.accesswidener" + } +} \ No newline at end of file